This puts the logic for checking the allowable index ranges in one place.
The base for an indexed component must now be one with a zero index. It
didn't make much sense to add an index to an already indexed component.
VertexFormat::offset no longer takes an index, since the helper function
can be used.
throw invalid_operation("VertexFormat::operator,");
VertexFormat r = *this;
unsigned char *c = r.data+r.data[0];
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;
+ *c = make_indexed_component(static_cast<VertexComponent>(*c), i);
-int VertexFormat::offset(VertexComponent comp, unsigned index) const
+int VertexFormat::offset(VertexComponent comp) 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 type = get_component_type(comp);
unsigned size = get_component_size(comp);
unsigned offs = 0;
for(const unsigned char *i=begin(); i!=end(); ++i)
unsigned size = get_component_size(comp);
unsigned offs = 0;
for(const unsigned char *i=begin(); i!=end(); ++i)
+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>=53)
+ 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();
void operator>>(const LexicalConverter &conv, VertexComponent &c)
{
const string &str = conv.get();
const unsigned char *begin() const { return data ? data+1 : 0; }
const unsigned char *end() const { return data ? data+1+data[0] : 0; }
unsigned stride() const;
const unsigned char *begin() const { return data ? data+1 : 0; }
const unsigned char *end() const { return data ? data+1+data[0] : 0; }
unsigned stride() const;
- int offset(VertexComponent, unsigned = 0) const;
+ int offset(VertexComponent) const;
};
inline VertexFormat operator,(VertexComponent c1, VertexComponent c2)
};
inline VertexFormat operator,(VertexComponent c1, VertexComponent c2)
inline VertexFormat operator,(VertexComponent c, unsigned i)
{ return (VertexFormat(c), i); }
inline VertexFormat operator,(VertexComponent c, unsigned i)
{ return (VertexFormat(c), i); }
+VertexComponent make_indexed_component(VertexComponent, unsigned);
+
inline unsigned get_component_type(unsigned char c)
{ return c>>2; }
inline unsigned get_component_type(unsigned char c)
{ return c>>2; }