X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=996871c4094ecc659566cd460175392c6b69600a;hb=c233a90fd05f1f5424d7fca94bb6b999f3061271;hp=de343bf7065a07aa573377a6e49be8114dd60356;hpb=b8fef9be469eb16e54068bac7e275ea225efc71c;p=libs%2Fgl.git

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index de343bf7..996871c4 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -1,16 +1,10 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include "arb_vertex_program.h"
-#include "extension.h"
+#include <msp/gl/extensions/arb_multitexture.h>
+#include <msp/gl/extensions/arb_vertex_shader.h>
+#include "buffer.h"
+#include "error.h"
 #include "gl.h"
-#include "version_1_2.h"
+#include "mesh.h"
 #include "vertexarray.h"
-#include "vertexbuffer.h"
 
 using namespace std;
 
@@ -18,37 +12,73 @@ namespace Msp {
 namespace GL {
 
 VertexArray::VertexArray(const VertexFormat &f):
-	vbuf(0),
-	own_vbuf(false)
+	dirty(false)
 {
 	reset(f);
 }
 
 VertexArray::~VertexArray()
 {
-	if(own_vbuf)
-		delete vbuf;
+	if(current()==this)
+	{
+		/* We must deactivate arrays here, or apply() would try to access deleted
+		data on the next invocation. */
+		set_current(0);
+		apply_arrays(0, &arrays, 0, 0);
+	}
 }
 
-void VertexArray::use_vertex_buffer()
+void VertexArray::reset(const VertexFormat &f)
 {
-	if(vbuf && own_vbuf)
-		return;
+	clear();
+	format = f;
+	stride = get_stride(format);
+
+	arrays.clear();
+
+	unsigned offs = 0;
+	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);
 
-	vbuf=new VertexBuffer();
-	own_vbuf=true;
+		Array &arr = arrays[slot];
+		arr.component = *c;
+		arr.offset = offs;
 
-	update_data();
+		offs += get_component_size(*c);
+	}
 }
 
-void VertexArray::use_vertex_buffer(VertexBuffer *b)
+unsigned VertexArray::get_array_slot(unsigned char comp)
 {
-	if(own_vbuf)
-		delete vbuf;
-	vbuf=b;
-	own_vbuf=false;
+	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;
+	}
+}
 
-	update_data();
+void VertexArray::clear()
+{
+	data.clear();
 }
 
 void VertexArray::reserve(unsigned n)
@@ -56,115 +86,147 @@ void VertexArray::reserve(unsigned n)
 	data.reserve(n*stride);
 }
 
-void VertexArray::clear()
+float *VertexArray::append()
 {
-	data.clear();
+	data.insert(data.end(), stride, 0.0f);
+	dirty = true;
+	return &*(data.end()-stride);
 }
 
-void VertexArray::reset(const VertexFormat &f)
+float *VertexArray::modify(unsigned i)
 {
-	clear();
-	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");
+	dirty = true;
+	return &data[0]+i*stride;
+}
+
+unsigned VertexArray::get_data_size() const
+{
+	return data.size()*sizeof(float);
+}
+
+void VertexArray::upload_data() const
+{
+	get_buffer()->sub_data(get_offset(), get_data_size(), &data[0]);
 }
 
 void VertexArray::apply() const
 {
 	if(format.empty())
-		throw InvalidState("Trying to apply a vertex array with no data");
+		throw invalid_operation("VertexArray::apply");
+	// Don't mess up the vertex array object of a mesh
+	if(Mesh::current())
+		throw invalid_operation("VertexArray::apply");
+
+	const VertexArray *old = current();
+	/* If the array has been modified, apply it even if it was the last one to
+	be applied.  This is necessary to get the data updated to vertex buffer, and
+	to resync things after a format change.  Radeon drivers also have some
+	problems with modifying vertex arrays without re-setting the pointers. */
+	if(!set_current(this) && !dirty)
+		return;
 
+	Buffer *vbuf = get_buffer();
 	if(vbuf)
-		vbuf->bind();
-
-	const float *base=vbuf?0:&data[0];
-	uint offset=0;
-	uint found=0;
-	uint bpv=stride*sizeof(float);
-	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
 	{
-		uint sz=(*c&3)+1;
-		uint t=*c>>2;
-		switch(t)
-		{
-		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-3, sz, GL_FLOAT, false, bpv, base+offset);
-			break;
-		}
-		found|=1<<t;
-		offset+=sz;
+		vbuf->bind_to(ARRAY_BUFFER);
+		if(dirty)
+			update_buffer();
 	}
 
-	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-3, (found>>i)&1, 1<<i);
+	const float *base = (vbuf ? reinterpret_cast<float *>(get_offset()) : &data[0]);
+	unsigned stride_bytes = stride*sizeof(float);
+	apply_arrays(&arrays, (old ? &old->arrays : 0), base, stride_bytes);
 
 	if(vbuf)
-		VertexBuffer::unbind();
+		Buffer::unbind_from(ARRAY_BUFFER);
 }
 
-/**
-Updates the VertexArray data to the VertexBuffer tied to the array, if any.
-*/
-void VertexArray::update_data()
+void VertexArray::apply_arrays(const vector<Array> *arrays, const vector<Array> *old_arrays, const float *base, unsigned stride_bytes)
 {
-	if(vbuf)
+	unsigned active_tex = 0;
+	unsigned n_arrays = arrays ? arrays->size() : 0;
+	if(old_arrays)
+		n_arrays = max<unsigned>(n_arrays, old_arrays->size());
+	for(unsigned i=0; i<n_arrays; ++i)
 	{
-		vbuf->data(data.size()*sizeof(float), &data[0]);
-		VertexBuffer::unbind();
+		const Array *arr = ((arrays && i<arrays->size() && (*arrays)[i].component) ? &(*arrays)[i] : 0);
+		const Array *old_arr = ((old_arrays && i<old_arrays->size() && (*old_arrays)[i].component) ? &(*old_arrays)[i] : 0);
+		if(!arr && !old_arr)
+			continue;
+
+		unsigned char comp = (arr ? arr->component : old_arr->component);
+		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+arr->offset);
+			array_type = GL_VERTEX_ARRAY;
+		}
+		else if(t==get_component_type(NORMAL3))
+		{
+			if(arr)
+				glNormalPointer(GL_FLOAT, stride_bytes, base+arr->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+arr->offset);
+				else
+					glColorPointer(sz, GL_FLOAT, stride_bytes, base+arr->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+arr->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+arr->offset);
+		}
+
+		// 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);
+		}
 	}
-}
 
-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;
-	}
-}
 
-unsigned VertexArray::enabled_arrays=0;
+VertexArray::Array::Array():
+	component(0),
+	offset(0)
+{ }
 
 
 VertexArray::Loader::Loader(VertexArray &a):
@@ -178,34 +240,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, sizei count)
-{
-	glDrawArrays(mode, first, count);
-}
-
-void draw_elements(PrimitiveType mode, sizei 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)
-{
-	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