X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Fvertexformat.cpp;h=e529f4eb2632770e91ae68b3bd221cc913ca0382;hb=86721a55699193e63c76e8a0a7b0ced0416c1cce;hp=6c2e2933ba0f06f7dc9c483321dc9b7fcf2a4138;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git diff --git a/source/core/vertexformat.cpp b/source/core/vertexformat.cpp index 6c2e2933..e529f4eb 100644 --- a/source/core/vertexformat.cpp +++ b/source/core/vertexformat.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -14,19 +15,19 @@ VertexFormat::VertexFormat(): count(0) { } -VertexFormat::VertexFormat(VertexComponent c): +VertexFormat::VertexFormat(VertexAttribute a): count(1) { - components[0] = c; + attributes[0] = a; } -VertexFormat VertexFormat::operator,(VertexComponent c) const +VertexFormat VertexFormat::operator,(VertexAttribute a) const { - if(count>=MAX_COMPONENTS) + if(count>=MAX_ATTRIBUTES) throw invalid_operation("VertexFormat::operator,"); VertexFormat r = *this; - r.components[r.count++] = c; + r.attributes[r.count++] = a; return r; } @@ -37,8 +38,8 @@ VertexFormat VertexFormat::operator,(unsigned i) const throw invalid_operation("VertexFormat::operator,"); VertexFormat r = *this; - unsigned char *c = &r.components[r.count-1]; - *c = make_indexed_component(static_cast(*c), i); + unsigned char &a = r.attributes[r.count-1]; + a = make_indexed_attribute(static_cast(a), i); return r; } @@ -47,94 +48,110 @@ bool VertexFormat::operator==(const VertexFormat &other) const { if(count!=other.count) return false; - return equal(components, components+count, other.components); + return equal(attributes, attributes+count, other.attributes); } unsigned VertexFormat::stride() const { unsigned s = 0; for(const unsigned char *i=begin(); i!=end(); ++i) - s += get_component_size(*i); + s += get_attribute_size(*i); return s; } -int VertexFormat::offset(VertexComponent comp) const +int VertexFormat::offset(VertexAttribute attr) const { - unsigned type = get_component_type(comp); - unsigned size = get_component_size(comp); + unsigned sem = get_attribute_semantic(attr); + unsigned sz = get_attribute_size(attr); unsigned offs = 0; for(const unsigned char *i=begin(); i!=end(); ++i) { - if(get_component_type(*i)==type) + if(get_attribute_semantic(*i)==sem) { - if(get_component_size(*i)>=size) + if(get_attribute_size(*i)>=sz) return offs; else return -1; } else - offs += get_component_size(*i); + offs += get_attribute_size(*i); } return -1; } -VertexComponent make_indexed_component(VertexComponent comp, unsigned index) + +VertexAttribute make_indexed_attribute(VertexAttribute attr, unsigned index) { - if(comp>=TEXCOORD1 && comp<=TEXCOORD4) + unsigned base = attr; + if(attr>=TEXCOORD1 && attr<=TEXCOORD4) { if(index>=4) - throw out_of_range("make_indexed_component"); + throw out_of_range("make_indexed_attribute"); } - else if(comp>=ATTRIB1 && comp<=ATTRIB4) + else if(attr>=RAW_ATTRIB1 && attr<=RAW_ATTRIB4) + base &= 7; + else if(attrGENERIC4) + throw invalid_argument("make_indexed_attribute"); + + if(static_cast((base>>3)+index)>=31) + throw out_of_range("make_indexed_attribute"); + + return static_cast(base+index*8); +} + + +bool convert_attribute(const string &str, const char *name, int min_size, int max_size, VertexAttribute &attr, VertexAttribute base_attr) +{ + string::const_iterator i = str.begin(); + for(; *name; ++name, ++i) + if(*i!=*name) + return false; + if(i==str.end() || *i<'0'+min_size || *i>'0'+max_size) + return false; + VertexAttribute result = static_cast(base_attr+(*i-'0'-min_size)); + + if(++i!=str.end()) { - if(index>=24) - throw out_of_range("make_indexed_component"); + if(*i!='_' || ++i==str.end()) + return false; + try + { + result = make_indexed_attribute(result, lexical_cast(string(i, str.end()))); + } + catch(...) + { + // The operator>> will throw a more appropriate exception + return false; + } } - else - throw invalid_argument("make_indexed_component"); - return static_cast(comp+index*4); + + attr = result; + return true; } -void operator>>(const LexicalConverter &conv, VertexComponent &c) +void operator>>(const LexicalConverter &conv, VertexAttribute &a) { const string &str = conv.get(); - if(str.size()==7 && !str.compare(0, 6, "VERTEX") && str[6]>='2' && str[6]<='4') - c = static_cast(VERTEX2+(str[6]-'2')); - else if(str=="NORMAL3") - c = NORMAL3; + if(str=="NORMAL3") + a = 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(COLOR3_FLOAT+(str[5]-'3')); + a = static_cast(COLOR3_FLOAT+(str[5]-'3')); else if(str=="COLOR4_UBYTE") - c = COLOR4_UBYTE; + a = COLOR4_UBYTE; else if(str=="TANGENT3") - c = TANGENT3; + a = 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) - c = static_cast(TEXCOORD1+(str[8]-'1')); - else if(str.size()==11 && str[9]=='_' && str[10]>='0' && str[10]<='7') - c = static_cast(TEXCOORD1+(str[8]-'1')+(str[10]-'0')*4); - else - 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]=='_') { - unsigned n; - try - { - n = lexical_cast(str.substr(8)); - } - catch(const lexical_error &) - { - throw lexical_error(format("conversion of '%s' to VertexComponent", str)); - } - c = static_cast(ATTRIB1+(str[6]-'1')+n*4); + IO::print(IO::cerr, "BINORMAL3 attribute is deprecated\n"); + a = make_indexed_attribute(GENERIC3, 5); } - else - throw lexical_error(format("conversion of '%s' to VertexComponent", str)); + else if(!convert_attribute(str, "VERTEX", 2, 4, a, VERTEX2) && + !convert_attribute(str, "GROUP", 1, 4, a, GROUP1) && + !convert_attribute(str, "WEIGHT", 1, 4, a, WEIGHT1) && + !convert_attribute(str, "TEXCOORD", 1, 4, a, TEXCOORD1) && + !convert_attribute(str, "GENERIC", 1, 4, a, GENERIC1)) + throw lexical_error(format("conversion of '%s' to VertexAttribute", str)); } } // namespace GL