Refactor TextureCube face information functions with lookup tables

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

diff --git a/source/vertexformat.cpp b/source/vertexformat.cpp
index ea5845c5fc10f56cca9b217a6db5c405e9b0028c..8cc0cec990157719b87ffe70e640b4c579829f77 100644 (file)
--- a/source/vertexformat.cpp
+++ b/source/vertexformat.cpp
@@ -120,7 +120,7 @@ VertexComponent make_indexed_component(VertexComponent comp, unsigned index)
        }
        else if(comp>=ATTRIB1 && comp<=ATTRIB4)
        {
-               if(index>=53)
+               if(index>=24)
                        throw out_of_range("make_indexed_component");
        }
        else
@@ -139,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)
@@ -165,25 +169,5 @@ void operator>>(const LexicalConverter &conv, VertexComponent &c)
                throw lexical_error(format("conversion of '%s' to VertexComponent", str));
 }
 
-// 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));
-}
-
 } // namespace GL
 } // namespace Msp