#include <algorithm>
+#include <msp/io/print.h>
#include <msp/strings/format.h>
#include <msp/strings/lexicalcast.h>
#include <msp/strings/utils.h>
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;
+}
+
+VertexFormat VertexFormat::operator,(DataType t) const
+{
+ if(!count)
+ throw invalid_operation("VertexFormat::operator,");
+
+ VertexFormat r = *this;
+ UInt16 &a = r.attributes[r.count-1];
+ a = make_typed_attribute(static_cast<VertexAttribute>(a), t);
return r;
}
throw invalid_operation("VertexFormat::operator,");
VertexFormat r = *this;
- unsigned char *c = &r.components[r.count-1];
- *c = make_indexed_component(static_cast<VertexComponent>(*c), i);
+ UInt16 &a = r.attributes[r.count-1];
+ a = make_indexed_attribute(static_cast<VertexAttribute>(a), i);
return r;
}
{
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);
+ for(const UInt16 *i=begin(); i!=end(); ++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 offs = 0;
- for(const unsigned char *i=begin(); i!=end(); ++i)
+ for(const UInt16 *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_source_type(*i)==get_attribute_source_type(attr) &&
+ get_attribute_component_count(*i)>=get_attribute_component_count(attr))
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_typed_attribute(VertexAttribute attr, DataType type)
+{
+ if(is_matrix(type) || is_vector(type) || is_image(type))
+ throw invalid_argument("make_typed_attribute");
+
+ return static_cast<VertexAttribute>((attr&0xFC0F) | (type&0x0F)<<4 | (type&0x300)>>1);
+}
+
+VertexAttribute make_indexed_attribute(VertexAttribute attr, unsigned index)
{
- if(comp>=TEXCOORD1 && comp<=TEXCOORD4)
+ unsigned base = attr;
+ if(get_attribute_semantic(attr)==get_attribute_semantic(TEXCOORD1))
{
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");
+ throw out_of_range("make_indexed_attribute");
}
- else
- throw invalid_argument("make_indexed_component");
- return static_cast<VertexComponent>(comp+index*4);
+ else if(get_attribute_semantic(attr)==get_attribute_semantic(RAW_ATTRIB1))
+ base &= 0x3FF;
+ else if(get_attribute_semantic(attr)!=get_attribute_semantic(GENERIC1))
+ throw invalid_argument("make_indexed_attribute");
+
+ if(get_attribute_semantic(base)+index>=63)
+ throw out_of_range("make_indexed_attribute");
+
+ return static_cast<VertexAttribute>(base+(index<<10));
}
-void operator>>(const LexicalConverter &conv, VertexComponent &c)
+
+bool convert_attribute_type(string::const_iterator &i, string::const_iterator end, const char *name, VertexAttribute &attr, DataType type)
{
- const string &str = conv.get();
- if(str.size()==7 && !str.compare(0, 6, "VERTEX") && str[6]>='2' && str[6]<='4')
- c = static_cast<VertexComponent>(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<VertexComponent>(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::const_iterator j = i;
+ for(; (j!=end && *j!='_' && *name); ++name, ++j)
+ if(*j!=*name)
+ return false;
+
+ attr = make_typed_attribute(attr, type);
+ i = j;
+
+ return true;
+}
+
+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<VertexAttribute>(base_attr+(*i++-'0'-min_size));
+
+ while(i!=str.end())
{
- if(str.size()==9)
- c = static_cast<VertexComponent>(TEXCOORD1+(str[8]-'1'));
- else if(str.size()==11 && str[9]=='_' && str[10]>='0' && str[10]<='7')
- c = static_cast<VertexComponent>(TEXCOORD1+(str[8]-'1')+(str[10]-'0')*4);
+ if(*i!='_' || ++i==str.end())
+ return false;
+
+ if(isdigit(*i))
+ {
+ unsigned index = 0;
+ for(; (i!=str.end() && isdigit(*i)); ++i)
+ index = index*10+(*i-'0');
+ result = make_indexed_attribute(result, index);
+ }
+ else if(convert_attribute_type(i, str.end(), "UBYTE", result, UNSIGNED_BYTE) ||
+ convert_attribute_type(i, str.end(), "BYTE", result, BYTE) ||
+ convert_attribute_type(i, str.end(), "USHORT", result, UNSIGNED_SHORT) ||
+ convert_attribute_type(i, str.end(), "SHORT", result, SHORT) ||
+ convert_attribute_type(i, str.end(), "UINT", result, UNSIGNED_INT) ||
+ convert_attribute_type(i, str.end(), "INT", result, INT) ||
+ convert_attribute_type(i, str.end(), "FLOAT", result, FLOAT))
+ ;
else
- throw lexical_error(format("conversion of '%s' to VertexComponent", str));
+ return false;
}
- else if(str.size()>=9 && !str.compare(0, 6, "ATTRIB") && str[6]>='1' && str[6]<='4' && str[7]=='_')
+
+ attr = result;
+ return true;
+}
+
+void operator>>(const LexicalConverter &conv, VertexAttribute &a)
+{
+ const string &str = conv.get();
+ try
{
- unsigned n;
- try
- {
- n = lexical_cast<unsigned>(str.substr(8));
- }
- catch(const lexical_error &)
- {
- throw lexical_error(format("conversion of '%s' to VertexComponent", str));
- }
- c = static_cast<VertexComponent>(ATTRIB1+(str[6]-'1')+n*4);
+ if(convert_attribute(str, "VERTEX", 2, 4, a, VERTEX2) ||
+ convert_attribute(str, "COLOR", 3, 4, a, COLOR3) ||
+ convert_attribute(str, "NORMAL", 3, 3, a, NORMAL3) ||
+ convert_attribute(str, "TANGENT", 3, 3, a, TANGENT3) ||
+ 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))
+ return;
}
- else
- throw lexical_error(format("conversion of '%s' to VertexComponent", str));
+ catch(...)
+ { }
+
+ throw lexical_error(format("conversion of '%s' to VertexAttribute", str));
}
} // namespace GL
projects / libs / gl.git / blobdiff