X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=d834ab7c7f3044d8aa691d34288bd7f1805050a6;hb=b35ae038dd9d7456a207ecb30eb8960a00bbe71d;hp=8381d8adb1d9663b742db5a88af857f988b6bfd0;hpb=b617c5d7b5283ad260a77f01e42e6170cabbc03d;p=libs%2Fgl.git

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 8381d8ad..d834ab7c 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -1,16 +1,9 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "arb_vertex_program.h"
-#include "extension.h"
+#include "arb_multitexture.h"
+#include "arb_vertex_shader.h"
+#include "buffer.h"
+#include "error.h"
 #include "gl.h"
-#include "version_1_2.h"
 #include "vertexarray.h"
-#include "vertexbuffer.h"
 
 using namespace std;
 
@@ -18,37 +11,78 @@ namespace Msp {
 namespace GL {
 
 VertexArray::VertexArray(const VertexFormat &f):
-	vbuf(0),
-	own_vbuf(false)
+	defer_vbuf(true),
+	dirty(false)
 {
 	reset(f);
 }
 
 VertexArray::~VertexArray()
+{ }
+
+void VertexArray::reset(const VertexFormat &f)
+{
+	clear();
+	format = f;
+	stride = get_stride(format);
+
+	arrays.clear();
+
+	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
+	{
+		unsigned slot = get_array_slot(*c);
+		if(slot>=arrays.size())
+			arrays.resize(slot+1);
+		arrays[slot] = *c;
+	}
+}
+
+unsigned VertexArray::get_array_slot(unsigned char comp)
 {
-	if(own_vbuf)
-		delete vbuf;
+	unsigned t = get_component_type(comp);
+	if(t==get_component_type(VERTEX3))
+		return 0;
+	else if(t==get_component_type(NORMAL3))
+		return 1;
+	else if(t==get_component_type(COLOR4_FLOAT))
+		return 2;
+	else if(comp>=TEXCOORD1 && comp<=TEXCOORD4+12)
+	{
+		t -= get_component_type(TEXCOORD1);
+		if(t>0)
+			static Require _req(ARB_multitexture);
+		return 3+t;
+	}
+	else
+	{
+		static Require _req(ARB_vertex_shader);
+		if(comp>=ATTRIB1)
+			t -= get_component_type(ATTRIB1);
+		return 7+t;
+	}
 }
 
 void VertexArray::use_vertex_buffer()
 {
-	if(vbuf && own_vbuf)
+	if(vbuf)
 		return;
 
 	vbuf = new Buffer(ARRAY_BUFFER);
-	own_vbuf = true;
-
-	update_data();
+	defer_vbuf = false;
+	dirty = true;
 }
 
 void VertexArray::use_vertex_buffer(Buffer *b)
 {
-	if(own_vbuf)
-		delete vbuf;
 	vbuf = b;
-	own_vbuf = false;
+	vbuf.keep();
+	defer_vbuf = false;
+	dirty = true;
+}
 
-	update_data();
+void VertexArray::clear()
+{
+	data.clear();
 }
 
 void VertexArray::reserve(unsigned n)
@@ -56,116 +90,136 @@ void VertexArray::reserve(unsigned n)
 	data.reserve(n*stride);
 }
 
-void VertexArray::clear()
+float *VertexArray::append()
 {
-	data.clear();
+	data.insert(data.end(), stride, 0.0f);
+	set_dirty();
+	return &*(data.end()-stride);
 }
 
-void VertexArray::reset(const VertexFormat &f)
+float *VertexArray::modify(unsigned i)
 {
-	clear();
-	format = f;
-	stride = get_stride(format);
+	set_dirty();
+	return &data[0]+i*stride;
+}
 
-	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::set_dirty()
+{
+	dirty = true;
+	if(defer_vbuf)
+	{
+		vbuf = new Buffer(ARRAY_BUFFER);
+		defer_vbuf = false;
+	}
 }
 
 void VertexArray::apply() const
 {
 	if(format.empty())
-		throw InvalidState("Trying to apply a vertex array with no data");
+		throw invalid_operation("VertexArray::apply");
 
-	if(vbuf)
-		vbuf->bind();
+	const VertexArray *old = current();
+	if(!set_current(this))
+		return;
 
-	const float *base = vbuf?0:&data[0];
-	unsigned offset = 0;
-	unsigned found = 0;
-	unsigned bpv = stride*sizeof(float);
-	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
+	if(vbuf)
 	{
-		unsigned sz = (*c&3)+1;
-		unsigned t = *c>>2;
-		switch(t)
+		vbuf->bind_to(ARRAY_BUFFER);
+		if(dirty)
 		{
-		case 0:
-			glVertexPointer(sz, GL_FLOAT, bpv, base+offset);
-			break;
-		case 1:
-			glNormalPointer(GL_FLOAT, bpv, base+offset);
-			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);
-			break;
-		default:
-			glVertexAttribPointerARB(t-4, sz, GL_FLOAT, false, bpv, base+offset);
-			break;
+			vbuf->data(data.size()*sizeof(float), &data[0]);
+			dirty = false;
 		}
-		found |= 1<<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);
+	const float *base = (vbuf ? 0 : &data[0]);
+	unsigned offset = 0;
+	unsigned stride_bytes = stride*sizeof(float);
+	unsigned active_tex = 0;
+	unsigned n_arrays = arrays.size();
+	if(old)
+		n_arrays = max(n_arrays, old->arrays.size());
+	for(unsigned i=0; i<n_arrays; ++i)
+	{
+		unsigned char arr = (i<arrays.size() ? arrays[i] : 0);
+		unsigned char old_arr = (old && i<old->arrays.size() ? old->arrays[i] : 0);
+		if(!arr && !old_arr)
+			continue;
+
+		unsigned char comp = (arr ? arr : old_arr);
+		unsigned sz = get_component_size(comp);
+		unsigned t = get_component_type(comp);
+		GLenum array_type = 0;
+		if(t==get_component_type(VERTEX3))
+		{
+			if(arr)
+				glVertexPointer(sz, GL_FLOAT, stride_bytes, base+offset);
+			array_type = GL_VERTEX_ARRAY;
+		}
+		else if(t==get_component_type(NORMAL3))
+		{
+			if(arr)
+				glNormalPointer(GL_FLOAT, stride_bytes, base+offset);
+			array_type = GL_NORMAL_ARRAY;
+		}
+		else if(t==get_component_type(COLOR4_FLOAT))
+		{
+			if(arr)
+			{
+				if(sz==1)
+					glColorPointer(4, GL_UNSIGNED_BYTE, stride_bytes, base+offset);
+				else
+					glColorPointer(sz, GL_FLOAT, stride_bytes, base+offset);
+			}
+			array_type = GL_COLOR_ARRAY;
+		}
+		else if(comp>=TEXCOORD1 && comp<=TEXCOORD4+12)
+		{
+			t -= get_component_type(TEXCOORD1);
+			if(t>0 || active_tex)
+			{
+				glClientActiveTexture(GL_TEXTURE0+t);
+				active_tex = t;
+			}
+			if(arr)
+				glTexCoordPointer(sz, GL_FLOAT, stride_bytes, base+offset);
+			array_type = GL_TEXTURE_COORD_ARRAY;
+		}
+		else
+		{
+			if(t>=get_component_type(ATTRIB1))
+				t -= get_component_type(ATTRIB1);
+			if(arr)
+				glVertexAttribPointer(t, sz, GL_FLOAT, false, stride_bytes, base+offset);
+		}
 
-	if(vbuf)
-		vbuf->unbind();
-}
+		// Only change enable state if needed
+		if(arr && !old_arr)
+		{
+			if(array_type)
+				glEnableClientState(array_type);
+			else
+				glEnableVertexAttribArray(t);
+		}
+		else if(old_arr && !arr)
+		{
+			if(array_type)
+				glDisableClientState(array_type);
+			else
+				glDisableVertexAttribArray(t);
+		}
 
-/**
-Updates the VertexArray data to the VertexBuffer tied to the array, if any.
-*/
-void VertexArray::update_data()
-{
-	if(vbuf)
-	{
-		vbuf->data(data.size()*sizeof(float), &data[0]);
-		vbuf->unbind();
+		if(arr)
+			offset += sz;
 	}
-}
 
-float *VertexArray::append()
-{
-	data.insert(data.end(), stride, 0.0f);
-	return &*data.end()-stride;
-}
+	if(active_tex)
+		glClientActiveTexture(GL_TEXTURE0);
 
-void VertexArray::set_array(unsigned array, bool en, unsigned mask) const
-{
-	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;
-	}
+	if(vbuf)
+		Buffer::unbind_from(ARRAY_BUFFER);
 }
 
-unsigned VertexArray::enabled_arrays = 0;
-
 
 VertexArray::Loader::Loader(VertexArray &a):
 	VertexArrayBuilder(a)
@@ -178,34 +232,18 @@ VertexArray::Loader::Loader(VertexArray &a):
 	add("texcoord2", static_cast<void (Loader::*)(float, float)>(&Loader::texcoord));
 	add("texcoord3", static_cast<void (Loader::*)(float, float, float)>(&Loader::texcoord));
 	add("texcoord4", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::texcoord));
+	add("multitexcoord1", static_cast<void (Loader::*)(unsigned, float)>(&Loader::multitexcoord));
+	add("multitexcoord2", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::multitexcoord));
+	add("multitexcoord3", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::multitexcoord));
+	add("multitexcoord4", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::multitexcoord));
 	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));
-}
-
-
-void array_element(int i)
-{
-	glArrayElement(i);
-}
-
-void draw_arrays(PrimitiveType mode, int first, unsigned count)
-{
-	glDrawArrays(mode, first, count);
-}
-
-void draw_elements(PrimitiveType mode, unsigned count, DataType type, const void *indices)
-{
-	glDrawElements(mode, count, type, 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);
+	add("tangent3",  static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
+	add("binormal3", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
 }
 
 } // namespace GL