X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexformat.cpp;h=037305f8d74251c9e6cd882540df733e292afc30;hp=f5e175714187a9eb5a853abc9ba84aa3728864a9;hb=d901696935a6bf9fdad6ac8abe65ffab79bd297d;hpb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8 diff --git a/source/vertexformat.cpp b/source/vertexformat.cpp index f5e17571..037305f8 100644 --- a/source/vertexformat.cpp +++ b/source/vertexformat.cpp @@ -1,7 +1,8 @@ -#include +#include +#include #include #include -#include "except.h" +#include "error.h" #include "vertexformat.h" using namespace std; @@ -10,113 +11,82 @@ namespace Msp { namespace GL { VertexFormat::VertexFormat(): - data(0) + count(0) { } VertexFormat::VertexFormat(VertexComponent c): - data(new unsigned char[8]) + count(1) { - data[0] = 1; - data[1] = c; + components[0] = c; } -VertexFormat::VertexFormat(const VertexFormat &f): - data(0) +VertexFormat VertexFormat::operator,(VertexComponent c) const { - if(f.data) - { - data = new unsigned char[(f.data[0]&~7)+8]; - memcpy(data, f.data, f.data[0]+1); - } -} + if(count>=MAX_COMPONENTS) + throw invalid_operation("VertexFormat::operator,"); -VertexFormat &VertexFormat::operator=(const VertexFormat &f) -{ - delete[] data; - if(f.data) - { - data = new unsigned char[(f.data[0]&~7)+8]; - memcpy(data, f.data, f.data[0]+1); - } - else - data = 0; + VertexFormat r = *this; + r.components[r.count++] = c; - return *this; + return r; } -VertexFormat::~VertexFormat() +VertexFormat VertexFormat::operator,(unsigned i) const { - delete[] data; + if(!count) + throw invalid_operation("VertexFormat::operator,"); + + VertexFormat r = *this; + unsigned char *c = &r.components[r.count-1]; + *c = make_indexed_component(static_cast(*c), i); + + return r; } unsigned VertexFormat::stride() const { unsigned s = 0; for(const unsigned char *i=begin(); i!=end(); ++i) - s += (*i&3)+1; + s += get_component_size(*i); return s; } -int VertexFormat::offset(VertexComponent comp, unsigned index) const +int VertexFormat::offset(VertexComponent comp) const { - if((comp0) || (comp=8) || index>=53) - throw InvalidParameterValue("Vertex component index out of range"); - - unsigned type = (comp>>2)+index; - unsigned size = comp&3; + 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(static_cast(*i>>2)==type) + if(get_component_type(*i)==type) { - if((*i&3)>=size) + if(get_component_size(*i)>=size) return offs; else return -1; } else - offs += (*i&3)+1; + offs += get_component_size(*i); } return -1; } -VertexFormat operator,(const VertexFormat &f, VertexComponent c) +VertexComponent make_indexed_component(VertexComponent comp, unsigned index) { - VertexFormat r = f; - if(r.data) + if(comp>=TEXCOORD1 && comp<=TEXCOORD4) { - const unsigned char n = ++r.data[0]; - if((n&7)==7) - { - unsigned char *newdt = new unsigned char[n+9]; - memcpy(newdt, r.data, n); - delete r.data; - r.data = newdt; - } - r.data[n] = c; + if(index>=4) + throw out_of_range("make_indexed_component"); } - else + else if(comp>=ATTRIB1 && comp<=ATTRIB4) { - r.data = new unsigned char[8]; - r.data[0] = 1; - r.data[1] = c; + if(index>=24) + throw out_of_range("make_indexed_component"); } - - return r; -} - -VertexFormat operator,(const VertexFormat &f, unsigned i) -{ - if(!f.data) - throw InvalidState("VertexFormat has no components"); - VertexFormat r = f; - unsigned char *c = r.data+r.data[0]; - if((*c0) || (*c=8) || i>=53) - throw InvalidParameterValue("Vertex component index out of range"); - *c += i*4; - - return r; + else + throw invalid_argument("make_indexed_component"); + return static_cast(comp+index*4); } void operator>>(const LexicalConverter &conv, VertexComponent &c) @@ -130,6 +100,10 @@ void operator>>(const LexicalConverter &conv, VertexComponent &c) c = static_cast(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) @@ -137,7 +111,7 @@ void operator>>(const LexicalConverter &conv, VertexComponent &c) 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 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]=='_') { @@ -146,34 +120,14 @@ void operator>>(const LexicalConverter &conv, VertexComponent &c) { n = lexical_cast(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(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 parts = split(conv.get(), '_'); - for(vector::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::iterator i=parts.begin(); i!=parts.end(); ++i) - f = (f, lexical_cast(*i)); + throw lexical_error(format("conversion of '%s' to VertexComponent", str)); } } // namespace GL