- unsigned underscore=str.find('_', start);
- if(!str.compare(start, underscore-start, "VERTEX2"))
- f=(f,VERTEX2);
- else if(!str.compare(start, underscore-start, "VERTEX3"))
- f=(f,VERTEX3);
- else if(!str.compare(start, underscore-start, "VERTEX4"))
- f=(f,VERTEX4);
- else if(!str.compare(start, underscore-start, "NORMAL3"))
- f=(f,NORMAL3);
- else if(!str.compare(start, underscore-start, "TEXCOORD1"))
- f=(f,TEXCOORD1);
- else if(!str.compare(start, underscore-start, "TEXCOORD2"))
- f=(f,TEXCOORD2);
- else if(!str.compare(start, underscore-start, "TEXCOORD3"))
- f=(f,TEXCOORD3);
- else if(!str.compare(start, underscore-start, "TEXCOORD4"))
- f=(f,TEXCOORD4);
- else if(!str.compare(start, underscore-start, "COLOR4UB"))
- f=(f,COLOR4_UBYTE);
- else if(!str.compare(start, underscore-start, "COLOR3F"))
- f=(f,COLOR3_FLOAT);
- else if(!str.compare(start, underscore-start, "COLOR4F"))
- f=(f,COLOR4_FLOAT);
+ r.data = new unsigned char[8];
+ r.data[0] = 1;
+ r.data[1] = c;
+ }
+
+ return r;
+}
+
+VertexFormat VertexFormat::operator,(unsigned i) const
+{
+ 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 invalid_argument("VertexFormat::operator,");
+ *c += i*4;
+
+ 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();
+ if(str.size()==7 && !str.compare(0, 6, "VERTEX") && str[6]>='2' && str[6]<='4')
+ c = static_cast<VertexComponent>(VERTEX2+(str[6]-'2'));
+ else if(str=="NORMAL3")
+ c = NORMAL3;
+ else if(str.size()==12 && !str.compare(0, 5, "COLOR") && str[5]>='3' && str[5]<='4' && !str.compare(6, 6, "_FLOAT"))
+ c = static_cast<VertexComponent>(COLOR3_FLOAT+(str[5]-'3'));
+ else if(str=="COLOR4_UBYTE")
+ c = COLOR4_UBYTE;
+ else if(str.size()>=9 && !str.compare(0, 8, "TEXCOORD") && str[8]>='1' && str[8]<='4')
+ {
+ if(str.size()==9)
+ c = static_cast<VertexComponent>(TEXCOORD1+(str[8]-'1'));
+ 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);