X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=e91062bbda60b0f309f06c98effda44f6065eccd;hb=6e42e65cb070ef86ea748423a1c6e0a59a937958;hp=6e39930ea8db95792b0d9a5ae865d94d91c377a1;hpb=b392a49f4079cd3db859f9eaa51f651115a09c1d;p=libs%2Fgl.git

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 6e39930e..e91062bb 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -32,7 +32,7 @@ void VertexArray::reset(const VertexFormat &f)
 	bool has_gen_attrs = false;
 	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
 	{
-		if(*c>=TEXCOORD1+4 && *c<ATTRIB1)
+		if(*c>=TEXCOORD1+4 && *c<=TEXCOORD4+12)
 			has_multitex = true;
 		if(*c>=ATTRIB1)
 			has_gen_attrs = true;
@@ -116,48 +116,49 @@ void VertexArray::apply() const
 	unsigned active_tex = 0;
 	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
 	{
-		unsigned sz = (*c&3)+1;
-		unsigned t = *c>>2;
+		unsigned sz = get_component_size(*c);
+		unsigned t = get_component_type(*c);
 		bool en = enabled_arrays.is_set(t);
-		switch(t)
+		if(t==get_component_type(VERTEX3))
 		{
-		case 0:
 			glVertexPointer(sz, GL_FLOAT, bpv, base+offset);
 			if(!en)
 				glEnableClientState(GL_VERTEX_ARRAY);
-			break;
-		case 1:
+		}
+		else if(t==get_component_type(NORMAL3))
+		{
 			glNormalPointer(GL_FLOAT, bpv, base+offset);
 			if(!en)
 				glEnableClientState(GL_NORMAL_ARRAY);
-			break;
-		case 2:
+		}
+		else if(t==get_component_type(COLOR4_FLOAT))
+		{
 			if(sz==1)
 				glColorPointer(4, GL_UNSIGNED_BYTE, bpv, base+offset);
 			else
 				glColorPointer(sz, GL_FLOAT, bpv, base+offset);
 			if(!en)
 				glEnableClientState(GL_COLOR_ARRAY);
-			break;
-		default:
-			if(t<11)
-			{
-				if(t>3 || active_tex)
-				{
-					glClientActiveTexture(GL_TEXTURE0+(t-3));
-					active_tex = t-3;
-				}
-				glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset);
-				if(!en)
-					glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-			}
-			else
+		}
+		else if(*c>=TEXCOORD1 && *c<=TEXCOORD4+12)
+		{
+			t -= get_component_type(TEXCOORD1);
+			if(t>0 || active_tex)
 			{
-				glVertexAttribPointer(t-11, sz, GL_FLOAT, false, bpv, base+offset);
-				if(!en)
-					glEnableVertexAttribArray(t-11);
+				glClientActiveTexture(GL_TEXTURE0+t);
+				active_tex = t;
 			}
-			break;
+			glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset);
+			if(!en)
+				glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+		}
+		else
+		{
+			if(t>=get_component_type(ATTRIB1))
+				t -= get_component_type(ATTRIB1);
+			glVertexAttribPointer(t, sz, GL_FLOAT, false, bpv, base+offset);
+			if(!en)
+				glEnableVertexAttribArray(t);
 		}
 		found.set(t);
 		offset += sz;
@@ -166,21 +167,24 @@ void VertexArray::apply() const
 	for(unsigned i=0; i<64; ++i)
 		if(enabled_arrays.is_set(i) && !found.is_set(i))
 		{
-			if(i==0)
+			if(i==get_component_type(VERTEX3))
 				glDisableClientState(GL_VERTEX_ARRAY);
-			else if(i==1)
+			else if(i==get_component_type(NORMAL3))
 				glDisableClientState(GL_NORMAL_ARRAY);
-			else if(i==2)
+			else if(i==get_component_type(COLOR4_FLOAT))
 				glDisableClientState(GL_COLOR_ARRAY);
-			else if(i>=3 && i<11)
+			else if(i>=get_component_type(TEXCOORD1) && i<=get_component_type(TEXCOORD1)+3)
 			{
-				if(i>3 || active_tex)
-					glClientActiveTexture(GL_TEXTURE0+(i-3));
+				unsigned j = i-get_component_type(TEXCOORD1);
+				if(j>0 || active_tex)
+					glClientActiveTexture(GL_TEXTURE0+j);
 				glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-				active_tex = i-3;
+				active_tex = j;
 			}
+			else if(i<get_component_type(ATTRIB1))
+				glDisableVertexAttribArray(i);
 			else
-				glDisableVertexAttribArray(i-11);
+				glDisableVertexAttribArray(i-get_component_type(ATTRIB1));
 		}
 
 	enabled_arrays = found;