X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexformat.cpp;h=037305f8d74251c9e6cd882540df733e292afc30;hp=e56397e2b088cb93a1204d80027ef875b1c91a73;hb=c5f011ef508d580f332e4bd6065a013b24de8840;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d diff --git a/source/vertexformat.cpp b/source/vertexformat.cpp index e56397e2..037305f8 100644 --- a/source/vertexformat.cpp +++ b/source/vertexformat.cpp @@ -1,13 +1,8 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007-2010 Mikko Rasa, Mikkosoft Productions -Distributed under the LGPL -*/ - -#include +#include +#include #include -#include "except.h" +#include +#include "error.h" #include "vertexformat.h" using namespace std; @@ -16,164 +11,123 @@ 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]/8+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]/8+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; } -VertexFormat operator,(const VertexFormat &f, VertexComponent c) +int VertexFormat::offset(VertexComponent comp) const { - VertexFormat r = f; - if(r.data) + unsigned type = get_component_type(comp); + unsigned size = get_component_size(comp); + unsigned offs = 0; + for(const unsigned char *i=begin(); i!=end(); ++i) { - const unsigned char n = ++r.data[0]; - if((n&7)==7) + if(get_component_type(*i)==type) { - unsigned char *newdt = new unsigned char[n+9]; - memcpy(newdt, r.data, n); - delete r.data; - r.data = newdt; + if(get_component_size(*i)>=size) + return offs; + else + return -1; } - r.data[n] = c; - } - else - { - r.data = new unsigned char[8]; - r.data[0] = 1; - r.data[1] = c; + else + offs += get_component_size(*i); } - return r; + return -1; } -VertexFormat operator,(const VertexFormat &f, unsigned i) +VertexComponent make_indexed_component(VertexComponent comp, unsigned index) { - if(!f.data) - throw InvalidState("VertexFormat has no components"); - VertexFormat r = f; - unsigned char *c = r.data+r.data[0]; - if(*c=28) - throw InvalidParameterValue("Generic attribute index out of range"); - *c += i*4; - - return r; + if(comp>=TEXCOORD1 && comp<=TEXCOORD4) + { + if(index>=4) + throw out_of_range("make_indexed_component"); + } + else if(comp>=ATTRIB1 && comp<=ATTRIB4) + { + if(index>=24) + throw out_of_range("make_indexed_component"); + } + else + throw invalid_argument("make_indexed_component"); + return static_cast(comp+index*4); } -istream &operator>>(istream &in, VertexFormat &f) +void operator>>(const LexicalConverter &conv, VertexComponent &c) { - string str; - in>>str; - - unsigned start = 0; - - while(1) + 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; + 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')); + 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') { - string::size_type underscore = str.find('_', start); - bool fail = false; - 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); - else if(underscore>=start+8 && !str.compare(start, 6, "ATTRIB")) + 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 { - try - { - char n = str[start+6]; - unsigned i = lexical_cast(str.substr(start+7, underscore-start-7)); - if(n=='1') - f = (f,ATTRIB1,i); - else if(n=='2') - f = (f,ATTRIB2,i); - else if(n=='3') - f = (f,ATTRIB3,i); - else if(n=='4') - f = (f,ATTRIB4,i); - else - fail = true; - } - catch(const LexicalError &) - { - fail = true; - } + n = lexical_cast(str.substr(8)); } - else - fail = true; - - if(fail) + catch(const lexical_error &) { - in.setstate(ios_base::failbit); - break; + throw lexical_error(format("conversion of '%s' to VertexComponent", str)); } - - if(underscore==string::npos) - break; - start = underscore+1; + c = static_cast(ATTRIB1+(str[6]-'1')+n*4); } - - return in; + else + throw lexical_error(format("conversion of '%s' to VertexComponent", str)); } } // namespace GL