Add a less-than operator to Version

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

diff --git a/source/vertexformat.cpp b/source/vertexformat.cpp
index 2b18178b26db4734bcc3e3f673abb32324a10779..8cc0cec990157719b87ffe70e640b4c579829f77 100644 (file)
--- a/source/vertexformat.cpp
+++ b/source/vertexformat.cpp
@@ -1,14 +1,8 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <cstring>
+#include <algorithm>
+#include <msp/strings/format.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/utils.h>
-#include "except.h"
+#include "error.h"
 #include "vertexformat.h"
 
 using namespace std;
@@ -30,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)
@@ -43,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;
@@ -56,24 +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;
-}
-
-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;
                }
@@ -89,19 +71,63 @@ 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)
-               throw InvalidState("VertexFormat has no components");
-       VertexFormat r = f;
+       if(!data)
+               throw invalid_operation("VertexFormat::operator,");
+       VertexFormat r = *this;
        unsigned char *c = r.data+r.data[0];
-       if((*c<TEXCOORD1 && i>0) || (*c<ATTRIB1 && i>=8) || i>=53)
-               throw InvalidParameterValue("Vertex component index out of range");
-       *c += i*4;
+       *c = make_indexed_component(static_cast<VertexComponent>(*c), 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) const
+{
+       unsigned type = get_component_type(comp);
+       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;
+}
+
+VertexComponent make_indexed_component(VertexComponent comp, unsigned index)
+{
+       if(comp>=TEXCOORD1 && comp<=TEXCOORD4)
+       {
+               if(index>=4)
+                       throw out_of_range("make_indexed_component");
+       }
+       else if(comp>=ATTRIB1 && comp<=ATTRIB4)
+       {
+               if(index>=24)
+                       throw out_of_range("make_indexed_component");
+       }
+       else
+               throw invalid_argument("make_indexed_component");
+       return static_cast<VertexComponent>(comp+index*4);
+}
+
 void operator>>(const LexicalConverter &conv, VertexComponent &c)
 {
        const string &str = conv.get();
@@ -113,6 +139,10 @@ void operator>>(const LexicalConverter &conv, VertexComponent &c)
                c = static_cast<VertexComponent>(COLOR3_FLOAT+(str[5]-'3'));
        else if(str=="COLOR4_UBYTE")
                c = COLOR4_UBYTE;
+       else if(str=="TANGENT3")
+               c = TANGENT3;
+       else if(str=="BINORMAL3")
+               c = BINORMAL3;
        else if(str.size()>=9 && !str.compare(0, 8, "TEXCOORD") && str[8]>='1' && str[8]<='4')
        {
                if(str.size()==9)
@@ -120,7 +150,7 @@ void operator>>(const LexicalConverter &conv, VertexComponent &c)
                else if(str.size()==11 && str[9]=='_' && str[10]>='0' && str[10]<='7')
                        c = static_cast<VertexComponent>(TEXCOORD1+(str[8]-'1')+(str[10]-'0')*4);
                else
-                       throw LexicalError("Invalid texture unit in VertexComponent conversion");
+                       throw lexical_error(format("conversion of '%s' to VertexComponent", str));
        }
        else if(str.size()>=9 && !str.compare(0, 6, "ATTRIB") && str[6]>='1' && str[6]<='4' && str[7]=='_')
        {
@@ -129,34 +159,14 @@ void operator>>(const LexicalConverter &conv, VertexComponent &c)
                {
                        n = lexical_cast<unsigned>(str.substr(8));
                }
-               catch(const LexicalError &)
+               catch(const lexical_error &)
                {
-                       throw LexicalError("Invalid attribute in VertexComponent conversion");
+                       throw lexical_error(format("conversion of '%s' to VertexComponent", str));
                }
                c = static_cast<VertexComponent>(ATTRIB1+(str[6]-'1')+n*4);
        }
        else
-               throw LexicalError("Invalid input in VertexComponent conversion");
-}
-
-// XXX This will go away eventually
-void operator>>(const LexicalConverter &conv, VertexFormat &f)
-{
-       vector<string> parts = split(conv.get(), '_');
-       for(vector<string>::iterator i=parts.begin(); i!=parts.end(); ++i)
-       {
-               if(*i=="COLOR4UB")
-                       *i = "COLOR4_UBYTE";
-               else if(i->size()==7 && !i->compare(0, 5, "COLOR") && (*i)[6]=='F')
-                       *i = i->substr(0, 6)+"_FLOAT";
-               else if(i->size()>=10 && !i->compare(0, 8, "TEXCOORD"))
-                       *i = i->substr(0, 9)+"_"+i->substr(9);
-               else if(i->size()>=8 && !i->compare(0, 6, "ATTRIB"))
-                       *i = i->substr(0, 7)+"_"+i->substr(7);
-       }
-
-       for(vector<string>::iterator i=parts.begin(); i!=parts.end(); ++i)
-               f = (f, lexical_cast<VertexComponent>(*i));
+               throw lexical_error(format("conversion of '%s' to VertexComponent", str));
 }
 
 } // namespace GL