X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fvertexformat.cpp;fp=source%2Fcore%2Fvertexformat.cpp;h=05364be81ae8075c55102c29c2d0c892fb9094c3;hp=6c2e2933ba0f06f7dc9c483321dc9b7fcf2a4138;hb=ea7832c7c1ffab00cc1168bc8c41375fdd0eae86;hpb=7f03ee52e8af5f857e44702b6d1c2822a51c62ef

diff --git a/source/core/vertexformat.cpp b/source/core/vertexformat.cpp
index 6c2e2933..05364be8 100644
--- a/source/core/vertexformat.cpp
+++ b/source/core/vertexformat.cpp
@@ -14,19 +14,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 +37,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<VertexComponent>(*c), i);
+	unsigned char &a = r.attributes[r.count-1];
+	a = make_indexed_attribute(static_cast<VertexAttribute>(a), i);
 
 	return r;
 }
@@ -47,78 +47,79 @@ 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)
+	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>=ATTRIB1 && attr<=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);
+		throw invalid_argument("make_indexed_attribute");
+	return static_cast<VertexAttribute>(attr+index*4);
 }
 
-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<VertexComponent>(VERTEX2+(str[6]-'2'));
+		a = static_cast<VertexAttribute>(VERTEX2+(str[6]-'2'));
 	else if(str=="NORMAL3")
-		c = 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<VertexComponent>(COLOR3_FLOAT+(str[5]-'3'));
+		a = static_cast<VertexAttribute>(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;
+		a = BINORMAL3;
 	else if(str.size()>=9 && !str.compare(0, 8, "TEXCOORD") && str[8]>='1' && str[8]<='4')
 	{
 		if(str.size()==9)
-			c = static_cast<VertexComponent>(TEXCOORD1+(str[8]-'1'));
+			a = static_cast<VertexAttribute>(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);
+			a = static_cast<VertexAttribute>(TEXCOORD1+(str[8]-'1')+(str[10]-'0')*4);
 		else
-			throw lexical_error(format("conversion of '%s' to VertexComponent", str));
+			throw lexical_error(format("conversion of '%s' to VertexAttribute", str));
 	}
 	else if(str.size()>=9 && !str.compare(0, 6, "ATTRIB") && str[6]>='1' && str[6]<='4' && str[7]=='_')
 	{
@@ -129,12 +130,12 @@ void operator>>(const LexicalConverter &conv, VertexComponent &c)
 		}
 		catch(const lexical_error &)
 		{
-			throw lexical_error(format("conversion of '%s' to VertexComponent", str));
+			throw lexical_error(format("conversion of '%s' to VertexAttribute", str));
 		}
-		c = static_cast<VertexComponent>(ATTRIB1+(str[6]-'1')+n*4);
+		a = static_cast<VertexAttribute>(ATTRIB1+(str[6]-'1')+n*4);
 	}
 	else
-		throw lexical_error(format("conversion of '%s' to VertexComponent", str));
+		throw lexical_error(format("conversion of '%s' to VertexAttribute", str));
 }
 
 } // namespace GL