Memory allocation changes

[libs/gl.git] / source / vertexformat.cpp

diff --git a/source/vertexformat.cpp b/source/vertexformat.cpp
index e3f8bf97a5c49e5fe245975d09308de0e57295c9..0a26d94268847b94d443bcf6e9d47192936d1722 100644 (file)
--- a/source/vertexformat.cpp
+++ b/source/vertexformat.cpp
@@ -1,4 +1,4 @@
-#include <cstring>
+#include <algorithm>
 #include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
@@ -24,11 +24,7 @@ VertexFormat::VertexFormat(VertexComponent c):
 VertexFormat::VertexFormat(const VertexFormat &f):
        data(0)
 {
-       if(f.data)
-       {
-               data = new unsigned char[(f.data[0]&~7)+8];
-               memcpy(data, f.data, f.data[0]+1);
-       }
+       *this = f;
 }
 
 VertexFormat &VertexFormat::operator=(const VertexFormat &f)
@@ -37,7 +33,7 @@ VertexFormat &VertexFormat::operator=(const VertexFormat &f)
        if(f.data)
        {
                data = new unsigned char[(f.data[0]&~7)+8];
-               memcpy(data, f.data, f.data[0]+1);
+               copy(f.data, f.data+f.data[0]+1, data);
        }
        else
                data = 0;
@@ -50,48 +46,16 @@ VertexFormat::~VertexFormat()
        delete[] data;
 }
 
-unsigned VertexFormat::stride() const
-{
-       unsigned s = 0;
-       for(const unsigned char *i=begin(); i!=end(); ++i)
-               s += (*i&3)+1;
-       return s;
-}
-
-int VertexFormat::offset(VertexComponent comp, unsigned index) const
-{
-       if((comp<TEXCOORD1 && index>0) || (comp<ATTRIB1 && index>=8) || index>=53)
-               throw out_of_range("VertexFormat::offset");
-
-       unsigned type = (comp>>2)+index;
-       unsigned size = comp&3;
-       unsigned offs = 0;
-       for(const unsigned char *i=begin(); i!=end(); ++i)
-       {
-               if(static_cast<unsigned>(*i>>2)==type)
-               {
-                       if((*i&3)>=size)
-                               return offs;
-                       else
-                               return -1;
-               }
-               else
-                       offs += (*i&3)+1;
-       }
-
-       return -1;
-}
-
-VertexFormat operator,(const VertexFormat &f, VertexComponent c)
+VertexFormat VertexFormat::operator,(VertexComponent c) const
 {
-       VertexFormat r = f;
+       VertexFormat r = *this;
        if(r.data)
        {
                const unsigned char n = ++r.data[0];
-               if((n&7)==7)
+               if((n&7)==0)
                {
-                       unsigned char *newdt = new unsigned char[n+9];
-                       memcpy(newdt, r.data, n);
+                       unsigned char *newdt = new unsigned char[n+8];
+                       copy(r.data, r.data+n, newdt);
                        delete r.data;
                        r.data = newdt;
                }
@@ -107,11 +71,11 @@ VertexFormat operator,(const VertexFormat &f, VertexComponent c)
        return r;
 }
 
-VertexFormat operator,(const VertexFormat &f, unsigned i)
+VertexFormat VertexFormat::operator,(unsigned i) const
 {
-       if(!f.data)
+       if(!data)
                throw invalid_operation("VertexFormat::operator,");
-       VertexFormat r = f;
+       VertexFormat r = *this;
        unsigned char *c = r.data+r.data[0];
        if((*c<TEXCOORD1 && i>0) || (*c<ATTRIB1 && i>=8) || i>=53)
                throw invalid_argument("VertexFormat::operator,");
@@ -120,6 +84,38 @@ VertexFormat operator,(const VertexFormat &f, unsigned i)
        return r;
 }
 
+unsigned VertexFormat::stride() const
+{
+       unsigned s = 0;
+       for(const unsigned char *i=begin(); i!=end(); ++i)
+               s += get_component_size(*i);
+       return s;
+}
+
+int VertexFormat::offset(VertexComponent comp, unsigned index) const
+{
+       if((comp<TEXCOORD1 && index>0) || (comp<ATTRIB1 && index>=8) || index>=53)
+               throw out_of_range("VertexFormat::offset");
+
+       unsigned type = get_component_type(comp)+index;
+       unsigned size = get_component_size(comp);
+       unsigned offs = 0;
+       for(const unsigned char *i=begin(); i!=end(); ++i)
+       {
+               if(get_component_type(*i)==type)
+               {
+                       if(get_component_size(*i)>=size)
+                               return offs;
+                       else
+                               return -1;
+               }
+               else
+                       offs += get_component_size(*i);
+       }
+
+       return -1;
+}
+
 void operator>>(const LexicalConverter &conv, VertexComponent &c)
 {
        const string &str = conv.get();