X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=e3aef7a0eea16cd38302d068535edaa255c56028;hp=6c0e5f1aea363c8de02eeaea1c714f7ac1196645;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hpb=ab59f5a9e66b3fc7872ad96ec7949940189f0819

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 6c0e5f1a..e3aef7a0 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -1,8 +1,9 @@
-#include "arb_multitexture.h"
-#include "arb_vertex_shader.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 "mesh.h"
 #include "vertexarray.h"
 
 using namespace std;
@@ -10,80 +11,16 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-VertexArray::VertexArray(const VertexFormat &f):
-	defer_vbuf(true),
-	dirty(false)
+VertexArray::VertexArray(const VertexFormat &f)
 {
 	reset(f);
 }
 
-VertexArray::~VertexArray()
-{ }
-
 void VertexArray::reset(const VertexFormat &f)
 {
 	clear();
 	format = f;
 	stride = get_stride(format);
-
-	arrays.clear();
-
-	unsigned offset = 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);
-
-		Array &arr = arrays[slot];
-		arr.component = *c;
-		arr.offset = offset;
-
-		offset += get_component_size(*c);
-	}
-}
-
-unsigned VertexArray::get_array_slot(unsigned char comp)
-{
-	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)
-		return;
-
-	vbuf = new Buffer(ARRAY_BUFFER);
-	defer_vbuf = false;
-	dirty = true;
-}
-
-void VertexArray::use_vertex_buffer(Buffer *b)
-{
-	vbuf = b;
-	vbuf.keep();
-	defer_vbuf = false;
-	dirty = true;
 }
 
 void VertexArray::clear()
@@ -99,139 +36,47 @@ void VertexArray::reserve(unsigned n)
 float *VertexArray::append()
 {
 	data.insert(data.end(), stride, 0.0f);
-	set_dirty();
+	update_offset();
+	dirty = true;
 	return &*(data.end()-stride);
 }
 
 float *VertexArray::modify(unsigned i)
-{
-	set_dirty();
-	return &data[0]+i*stride;
-}
-
-void VertexArray::set_dirty()
 {
 	dirty = true;
-	if(defer_vbuf)
-	{
-		vbuf = new Buffer(ARRAY_BUFFER);
-		defer_vbuf = false;
-	}
+	return &data[0]+i*stride;
 }
 
-void VertexArray::apply() const
+unsigned VertexArray::get_data_size() const
 {
-	if(format.empty())
-		throw invalid_operation("VertexArray::apply");
-
-	const VertexArray *old = current();
-	if(!set_current(this))
-		return;
-
-	if(vbuf)
-	{
-		vbuf->bind_to(ARRAY_BUFFER);
-		if(dirty)
-		{
-			vbuf->data(data.size()*sizeof(float), &data[0]);
-			dirty = false;
-		}
-	}
-
-	const float *base = (vbuf ? 0 : &data[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)
-	{
-		const Array *arr = ((i<arrays.size() && arrays[i].component) ? &arrays[i] : 0);
-		const Array *old_arr = ((old && 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);
-		}
-	}
-
-	if(active_tex)
-		glClientActiveTexture(GL_TEXTURE0);
-
-	if(vbuf)
-		Buffer::unbind_from(ARRAY_BUFFER);
+	return data.size()*sizeof(float);
 }
 
 
-VertexArray::Array::Array():
-	component(0),
-	offset(0)
-{ }
-
-
 VertexArray::Loader::Loader(VertexArray &a):
 	VertexArrayBuilder(a)
 {
+	add("vertex", static_cast<void (Loader::*)(float, float)>(&Loader::vertex));
+	add("vertex", static_cast<void (Loader::*)(float, float, float)>(&Loader::vertex));
+	add("vertex", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::vertex));
+	add("normal", static_cast<void (Loader::*)(float, float, float)>(&Loader::normal));
+	add("texcoord", static_cast<void (Loader::*)(float)>(&Loader::texcoord));
+	add("texcoord", static_cast<void (Loader::*)(float, float)>(&Loader::texcoord));
+	add("texcoord", static_cast<void (Loader::*)(float, float, float)>(&Loader::texcoord));
+	add("texcoord", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::texcoord));
+	add("multitexcoord", static_cast<void (Loader::*)(unsigned, float)>(&Loader::multitexcoord));
+	add("multitexcoord", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::multitexcoord));
+	add("multitexcoord", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::multitexcoord));
+	add("multitexcoord", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::multitexcoord));
+	add("color", static_cast<void (Loader::*)(float, float, float)>(&Loader::color));
+	add("color", static_cast<void (Loader::*)(float, float, float, float)>(&Loader::color));
+	add("attrib", static_cast<void (Loader::*)(unsigned, float)>(&Loader::attrib));
+	add("attrib", static_cast<void (Loader::*)(unsigned, float, float)>(&Loader::attrib));
+	add("attrib", static_cast<void (Loader::*)(unsigned, float, float, float)>(&Loader::attrib));
+	add("attrib", static_cast<void (Loader::*)(unsigned, float, float, float, float)>(&Loader::attrib));
+	add("tangent", static_cast<void (Loader::*)(float, float, float)>(&Loader::tangent));
+	add("binormal", static_cast<void (Loader::*)(float, float, float)>(&Loader::binormal));
+
 	add("vertex2",   static_cast<void (Loader::*)(float, float)>(&Loader::vertex));
 	add("vertex3",   static_cast<void (Loader::*)(float, float, float)>(&Loader::vertex));
 	add("vertex4",   static_cast<void (Loader::*)(float, float, float, float)>(&Loader::vertex));