X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexformat.cpp;h=8cc0cec990157719b87ffe70e640b4c579829f77;hb=a48aaa402e2aacab780805f529cde4ded7ae3f59;hp=b9bd7b9402414f16ad3b0c70d11a835b12ef9c3f;hpb=e20075bffbbe1f3aaa9cc149953525a7e855f496;p=libs%2Fgl.git diff --git a/source/vertexformat.cpp b/source/vertexformat.cpp index b9bd7b94..8cc0cec9 100644 --- a/source/vertexformat.cpp +++ b/source/vertexformat.cpp @@ -1,13 +1,8 @@ -/* $Id$ - -This file is part of libmspgl -Copyright © 2007-2009 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; @@ -22,18 +17,14 @@ VertexFormat::VertexFormat(): VertexFormat::VertexFormat(VertexComponent c): data(new unsigned char[8]) { - data[0]=1; - data[1]=c; + data[0] = 1; + data[1] = c; } VertexFormat::VertexFormat(const VertexFormat &f): data(0) { - if(f.data) - { - data=new unsigned char[f.data[0]/8+8]; - memcpy(data, f.data, f.data[0]+1); - } + *this = f; } VertexFormat &VertexFormat::operator=(const VertexFormat &f) @@ -41,11 +32,11 @@ 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); + data = new unsigned char[(f.data[0]&~7)+8]; + copy(f.data, f.data+f.data[0]+1, data); } else - data=0; + data = 0; return *this; } @@ -55,125 +46,127 @@ VertexFormat::~VertexFormat() delete[] data; } -VertexFormat operator,(const VertexFormat &f, VertexComponent c) +VertexFormat VertexFormat::operator,(VertexComponent c) const { - VertexFormat r=f; + VertexFormat r = *this; if(r.data) { - const unsigned char n=++r.data[0]; - if((n&7)==7) + const unsigned char n = ++r.data[0]; + if((n&7)==0) { - unsigned char *newdt=new unsigned char[n+9]; - memcpy(newdt, r.data, n); + unsigned char *newdt = new unsigned char[n+8]; + copy(r.data, r.data+n, newdt); delete r.data; - r.data=newdt; + r.data = newdt; } - r.data[n]=c; + r.data[n] = c; } else { - r.data=new unsigned char[8]; - r.data[0]=1; - r.data[1]=c; + r.data = new unsigned char[8]; + r.data[0] = 1; + r.data[1] = c; } return r; } -VertexFormat operator,(const VertexFormat &f, unsigned i) +VertexFormat VertexFormat::operator,(unsigned i) const { - 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; + if(!data) + throw invalid_operation("VertexFormat::operator,"); + VertexFormat r = *this; + unsigned char *c = r.data+r.data[0]; + *c = make_indexed_component(static_cast(*c), i); return r; } -uint get_stride(const VertexFormat &f) +unsigned VertexFormat::stride() const { - uint stride=0; - for(const unsigned char *i=f.begin(); i!=f.end(); ++i) - stride+=(*i&3)+1; - return stride; + unsigned s = 0; + for(const unsigned char *i=begin(); i!=end(); ++i) + s += get_component_size(*i); + return s; } -istream &operator>>(istream &in, VertexFormat &f) +int VertexFormat::offset(VertexComponent comp) const { - string str; - in>>str; - - unsigned start=0; - - while(1) + unsigned type = get_component_type(comp); + unsigned size = get_component_size(comp); + unsigned offs = 0; + for(const unsigned char *i=begin(); i!=end(); ++i) { - 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(get_component_type(*i)==type) { - 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; - } + if(get_component_size(*i)>=size) + return offs; + else + return -1; } else - fail=true; + offs += get_component_size(*i); + } - if(fail) - { - in.setstate(ios_base::failbit); - break; - } + return -1; +} - if(underscore==string::npos) - break; - start=underscore+1; +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>=24) + throw out_of_range("make_indexed_component"); } + else + throw invalid_argument("make_indexed_component"); + return static_cast(comp+index*4); +} - return in; +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(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') + { + 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); + } + else + throw lexical_error(format("conversion of '%s' to VertexComponent", str)); } } // namespace GL