X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=c6724e13a27f05d1c509ac189d379fe3f392c2e6;hb=ceae2a27dfc58310c5bab7e3aa3fedf0fa9a1f49;hp=3c17141cfb59a592264505c7c67956cc5a9fd355;hpb=dc1d1159a61f378bda11e5989ad694a86b9a3c77;p=libs%2Fgl.git

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 3c17141c..c6724e13 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -1,10 +1,11 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include "arb_vertex_program.h"
 #include "extension.h"
 #include "gl.h"
 #include "version_1_2.h"
@@ -16,15 +17,11 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-VertexArray::VertexArray(VertexFormat f):
-	format(NODATA),
-	stride(get_stride(f)),
+VertexArray::VertexArray(const VertexFormat &f):
 	vbuf(0),
 	own_vbuf(false)
 {
-	// Reverse the format so the first item is in lowest bits.  This makes handling in bind() easier.
-	for(uint fmt=f; fmt; fmt>>=4)
-		format=(format, static_cast<VertexFormat>(fmt&15));
+	reset(f);
 }
 
 VertexArray::~VertexArray()
@@ -38,13 +35,13 @@ void VertexArray::use_vertex_buffer()
 	if(vbuf && own_vbuf)
 		return;
 
-	vbuf=new VertexBuffer();
+	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;
@@ -64,49 +61,57 @@ void VertexArray::clear()
 	data.clear();
 }
 
-void VertexArray::reset(VertexFormat f)
+void VertexArray::reset(const VertexFormat &f)
 {
 	clear();
-	format=NODATA;
-	for(uint fmt=f; fmt; fmt>>=4)
-		format=(format, static_cast<VertexFormat>(fmt&15));
+	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);
+	if(has_gen_attrs)
+		static RequireExtension _ext("GL_ARB_vertex_program");
 }
 
 void VertexArray::apply() const
 {
-	if(format==NODATA)
-		throw InvalidState("Trying to apply a vertex apply of format NODATA");
+	if(format.empty())
+		throw InvalidState("Trying to apply a vertex array with no data");
 
 	if(vbuf)
 		vbuf->bind();
 
 	const float *base=vbuf?0:&data[0];
-	uint offset=0;
-	uint found=0;
-	uint bpv=stride*sizeof(float);
-	for(uint fmt=format; fmt; fmt>>=4)
+	unsigned offset=0;
+	unsigned found=0;
+	unsigned bpv=stride*sizeof(float);
+	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
 	{
-		uint sz=(fmt&3)+1;
-		switch(fmt&12)
+		unsigned sz=(*c&3)+1;
+		unsigned t=*c>>2;
+		switch(t)
 		{
 		case 0:
 			glVertexPointer(sz, GL_FLOAT, bpv, base+offset);
 			break;
-		case 4:
+		case 1:
 			glNormalPointer(GL_FLOAT, bpv, base+offset);
 			break;
-		case 8:
+		case 2:
 			glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset);
 			break;
-		case 12:
+		case 3:
 			if(sz==1)
 				glColorPointer(4, GL_UNSIGNED_BYTE, bpv, base+offset);
 			else
 				glColorPointer(sz, GL_FLOAT, bpv, base+offset);
 			break;
+		default:
+			glVertexAttribPointerARB(t-4, sz, GL_FLOAT, false, bpv, base+offset);
+			break;
 		}
-		found|=1<<((fmt&12)>>2);
+		found|=1<<t;
 		offset+=sz;
 	}
 
@@ -114,9 +119,11 @@ void VertexArray::apply() const
 	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);
 
 	if(vbuf)
-		VertexBuffer::unbind();
+		vbuf->unbind();
 }
 
 /**
@@ -127,7 +134,7 @@ void VertexArray::update_data()
 	if(vbuf)
 	{
 		vbuf->data(data.size()*sizeof(float), &data[0]);
-		VertexBuffer::unbind();
+		vbuf->unbind();
 	}
 }
 
@@ -137,16 +144,22 @@ float *VertexArray::append()
 	return &*data.end()-stride;
 }
 
-void VertexArray::set_array(unsigned array, unsigned bit, unsigned mask) const
+void VertexArray::set_array(unsigned array, bool en, unsigned mask) const
 {
-	if((enabled_arrays&mask) && !bit)
+	if((enabled_arrays&mask) && !en)
 	{
-		glDisableClientState(array);
+		if(mask<16)
+			glDisableClientState(array);
+		else
+			glDisableVertexAttribArrayARB(array);
 		enabled_arrays&=~mask;
 	}
-	else if(!(enabled_arrays&mask) && bit)
+	else if(!(enabled_arrays&mask) && en)
 	{
-		glEnableClientState(array);
+		if(mask<16)
+			glEnableClientState(array);
+		else
+			glEnableVertexAttribArrayARB(array);
 		enabled_arrays|=mask;
 	}
 }
@@ -167,6 +180,10 @@ VertexArray::Loader::Loader(VertexArray &a):
 	add("texcoord4", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::texcoord));
 	add("color3",    static_cast<void (Loader::*)(float, float, float)>(&Loader::color));
 	add("color4",    static_cast<void (Loader::*)(float, float, float, float)>(&Loader::color));
+	add("attrib1",   static_cast<void (Loader::*)(unsigned, float)>(&Loader::attrib));
+	add("attrib2",   static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::attrib));
+	add("attrib3",   static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::attrib));
+	add("attrib4",   static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::attrib));
 }
 
 
@@ -175,17 +192,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);