X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=395f217a97ecff6c9c76c3a6985fdfa97f163978;hb=5a07a1fdfa420d257221228676a3c76a5eb4f44f;hp=6740818e794228e78ebedbbc880855aa3abcb33c;hpb=d653d25b548070c688e40c052730d63345ce70c9;p=libs%2Fgl.git

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 6740818e..395f217a 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -9,6 +9,7 @@ Distributed under the LGPL
 #include "extension.h"
 #include "gl.h"
 #include "version_1_2.h"
+#include "version_1_3.h"
 #include "vertexarray.h"
 #include "vertexbuffer.h"
 
@@ -35,18 +36,18 @@ void VertexArray::use_vertex_buffer()
 	if(vbuf && own_vbuf)
 		return;
 
-	vbuf=new VertexBuffer();
-	own_vbuf=true;
+	vbuf = new Buffer(ARRAY_BUFFER);
+	own_vbuf = true;
 
 	update_data();
 }
 
-void VertexArray::use_vertex_buffer(VertexBuffer *b)
+void VertexArray::use_vertex_buffer(Buffer *b)
 {
 	if(own_vbuf)
 		delete vbuf;
-	vbuf=b;
-	own_vbuf=false;
+	vbuf = b;
+	own_vbuf = false;
 
 	update_data();
 }
@@ -64,12 +65,20 @@ void VertexArray::clear()
 void VertexArray::reset(const VertexFormat &f)
 {
 	clear();
-	format=f;
-	stride=get_stride(format);
+	format = f;
+	stride = get_stride(format);
 
-	bool has_gen_attrs=false;
-	for(const unsigned char *c=format.begin(); (!has_gen_attrs && c!=format.end()); ++c)
-		has_gen_attrs=(*c>=ATTRIB1);
+	bool has_multitex = false;
+	bool has_gen_attrs = false;
+	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
+	{
+		if(*c>=TEXCOORD1+4 && *c<ATTRIB1)
+			has_multitex = true;
+		if(*c>=ATTRIB1)
+			has_gen_attrs = true;
+	}
+	if(has_multitex)
+		static RequireVersion _ver(1, 3);
 	if(has_gen_attrs)
 		static RequireExtension _ext("GL_ARB_vertex_program");
 }
@@ -82,48 +91,86 @@ void VertexArray::apply() const
 	if(vbuf)
 		vbuf->bind();
 
-	const float *base=vbuf?0:&data[0];
-	uint offset=0;
-	uint found=0;
-	uint bpv=stride*sizeof(float);
+	const float *base = vbuf?0:&data[0];
+	unsigned offset = 0;
+	ArrayMask found;
+	unsigned bpv = stride*sizeof(float);
+	unsigned active_tex = 0;
 	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
 	{
-		uint sz=(*c&3)+1;
-		uint t=*c>>2;
+		unsigned sz = (*c&3)+1;
+		unsigned t = *c>>2;
+		bool en = enabled_arrays.is_set(t);
 		switch(t)
 		{
 		case 0:
 			glVertexPointer(sz, GL_FLOAT, bpv, base+offset);
+			if(!en)
+				glEnableClientState(GL_VERTEX_ARRAY);
 			break;
 		case 1:
 			glNormalPointer(GL_FLOAT, bpv, base+offset);
+			if(!en)
+				glEnableClientState(GL_NORMAL_ARRAY);
 			break;
 		case 2:
-			glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset);
-			break;
-		case 3:
 			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:
-			glVertexAttribPointerARB(t-4, sz, GL_FLOAT, false, bpv, base+offset);
+			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
+			{
+				glVertexAttribPointerARB(t-11, sz, GL_FLOAT, false, bpv, base+offset);
+				if(!en)
+					glEnableVertexAttribArrayARB(t-11);
+			}
 			break;
 		}
-		found|=1<<t;
-		offset+=sz;
+		found.set(t);
+		offset += sz;
 	}
 
-	set_array(GL_VERTEX_ARRAY, found&1, 1);
-	set_array(GL_NORMAL_ARRAY, found&2, 2);
-	set_array(GL_TEXTURE_COORD_ARRAY, found&4, 4);
-	set_array(GL_COLOR_ARRAY, found&8, 8);
-	for(unsigned i=4; i<32; ++i)
-		set_array(i-4, (found>>i)&1, 1<<i);
+	for(unsigned i=0; i<64; ++i)
+		if(enabled_arrays.is_set(i) && !found.is_set(i))
+		{
+			if(i==0)
+				glDisableClientState(GL_VERTEX_ARRAY);
+			else if(i==1)
+				glDisableClientState(GL_NORMAL_ARRAY);
+			else if(i==2)
+				glDisableClientState(GL_COLOR_ARRAY);
+			else if(i>=3 && i<11)
+			{
+				if(i>3 || active_tex)
+					glClientActiveTexture(GL_TEXTURE0+(i-3));
+				glDisableClientState(GL_TEXTURE_COORD_ARRAY);
+			}
+			else
+				glDisableVertexAttribArrayARB(i-11);
+		}
+
+	enabled_arrays = found;
+
+	if(active_tex)
+		glClientActiveTexture(GL_TEXTURE0);
 
 	if(vbuf)
-		VertexBuffer::unbind();
+		vbuf->unbind();
 }
 
 /**
@@ -134,7 +181,7 @@ void VertexArray::update_data()
 	if(vbuf)
 	{
 		vbuf->data(data.size()*sizeof(float), &data[0]);
-		VertexBuffer::unbind();
+		vbuf->unbind();
 	}
 }
 
@@ -144,27 +191,24 @@ float *VertexArray::append()
 	return &*data.end()-stride;
 }
 
-void VertexArray::set_array(unsigned array, bool en, unsigned mask) const
+VertexArray::ArrayMask VertexArray::enabled_arrays;
+
+
+VertexArray::ArrayMask::ArrayMask()
 {
-	if((enabled_arrays&mask) && !en)
-	{
-		if(mask<16)
-			glDisableClientState(array);
-		else
-			glDisableVertexAttribArrayARB(array);
-		enabled_arrays&=~mask;
-	}
-	else if(!(enabled_arrays&mask) && en)
-	{
-		if(mask<16)
-			glEnableClientState(array);
-		else
-			glEnableVertexAttribArrayARB(array);
-		enabled_arrays|=mask;
-	}
+	for(unsigned i=0; i<N; ++i)
+		mask[i] = 0;
 }
 
-unsigned VertexArray::enabled_arrays=0;
+void VertexArray::ArrayMask::set(unsigned bit)
+{
+	mask[bit/B] |= 1<<(bit%B);
+}
+
+bool VertexArray::ArrayMask::is_set(unsigned bit) const
+{
+	return mask[bit/B]&(1<<(bit%B));
+}
 
 
 VertexArray::Loader::Loader(VertexArray &a):
@@ -192,17 +236,17 @@ void array_element(int i)
 	glArrayElement(i);
 }
 
-void draw_arrays(PrimitiveType mode, int first, sizei count)
+void draw_arrays(PrimitiveType mode, int first, unsigned count)
 {
 	glDrawArrays(mode, first, count);
 }
 
-void draw_elements(PrimitiveType mode, sizei count, DataType type, const void *indices)
+void draw_elements(PrimitiveType mode, unsigned count, DataType type, const void *indices)
 {
 	glDrawElements(mode, count, type, indices);
 }
 
-void draw_range_elements(PrimitiveType mode, uint low, uint high, sizei count, DataType type, const void *indices)
+void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, DataType type, const void *indices)
 {
 	static RequireVersion _ver(1, 2);
 	glDrawRangeElements(mode, low, high, count, type, indices);