X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fvertexarray.cpp;h=e3aef7a0eea16cd38302d068535edaa255c56028;hb=bec07999d95b76f4b47cffcc564d0cd0afc0435e;hp=79d6823135c75fe038f8dd7039a32edae6df7d46;hpb=8e9d872c2ba8dc633d29a673ba93adf38d262a5c;p=libs%2Fgl.git

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 79d68231..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,55 +11,16 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-VertexArray::ArrayMask VertexArray::enabled_arrays;
-
-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);
-
-	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<=TEXCOORD4+12)
-			has_multitex = true;
-		if(*c==TANGENT3 || *c==BINORMAL3 || *c>=ATTRIB1)
-			has_gen_attrs = true;
-	}
-	if(has_multitex)
-		static Require _req(ARB_multitexture);
-	if(has_gen_attrs)
-		static Require _req(ARB_vertex_shader);
-}
-
-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()
@@ -74,149 +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;
-	}
-}
-
-void VertexArray::apply() const
-{
-	if(format.empty())
-		throw invalid_operation("VertexArray::apply");
-
-	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 offset = 0;
-	ArrayMask found;
-	unsigned bpv = stride*sizeof(float);
-	unsigned active_tex = 0;
-	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
-	{
-		unsigned sz = get_component_size(*c);
-		unsigned t = get_component_type(*c);
-		bool en = enabled_arrays.is_set(t);
-		if(t==get_component_type(VERTEX3))
-		{
-			glVertexPointer(sz, GL_FLOAT, bpv, base+offset);
-			if(!en)
-				glEnableClientState(GL_VERTEX_ARRAY);
-		}
-		else if(t==get_component_type(NORMAL3))
-		{
-			glNormalPointer(GL_FLOAT, bpv, base+offset);
-			if(!en)
-				glEnableClientState(GL_NORMAL_ARRAY);
-		}
-		else if(t==get_component_type(COLOR4_FLOAT))
-		{
-			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);
-		}
-		else if(*c>=TEXCOORD1 && *c<=TEXCOORD4+12)
-		{
-			t -= get_component_type(TEXCOORD1);
-			if(t>0 || active_tex)
-			{
-				glClientActiveTexture(GL_TEXTURE0+t);
-				active_tex = t;
-			}
-			glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset);
-			if(!en)
-				glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-		}
-		else
-		{
-			if(t>=get_component_type(ATTRIB1))
-				t -= get_component_type(ATTRIB1);
-			glVertexAttribPointer(t, sz, GL_FLOAT, false, bpv, base+offset);
-			if(!en)
-				glEnableVertexAttribArray(t);
-		}
-		found.set(t);
-		offset += sz;
-	}
-
-	for(unsigned i=0; i<64; ++i)
-		if(enabled_arrays.is_set(i) && !found.is_set(i))
-		{
-			if(i==get_component_type(VERTEX3))
-				glDisableClientState(GL_VERTEX_ARRAY);
-			else if(i==get_component_type(NORMAL3))
-				glDisableClientState(GL_NORMAL_ARRAY);
-			else if(i==get_component_type(COLOR4_FLOAT))
-				glDisableClientState(GL_COLOR_ARRAY);
-			else if(i>=get_component_type(TEXCOORD1) && i<=get_component_type(TEXCOORD1)+3)
-			{
-				unsigned j = i-get_component_type(TEXCOORD1);
-				if(j>0 || active_tex)
-					glClientActiveTexture(GL_TEXTURE0+j);
-				glDisableClientState(GL_TEXTURE_COORD_ARRAY);
-				active_tex = j;
-			}
-			else if(i<get_component_type(ATTRIB1))
-				glDisableVertexAttribArray(i);
-			else
-				glDisableVertexAttribArray(i-get_component_type(ATTRIB1));
-		}
-
-	enabled_arrays = found;
-
-	if(active_tex)
-		glClientActiveTexture(GL_TEXTURE0);
-
-	if(vbuf)
-		Buffer::unbind_from(ARRAY_BUFFER);
-}
-
-
-VertexArray::ArrayMask::ArrayMask()
-{
-	for(unsigned i=0; i<N; ++i)
-		mask[i] = 0;
-}
-
-void VertexArray::ArrayMask::set(unsigned bit)
-{
-	mask[bit/B] |= 1<<(bit%B);
+	return &data[0]+i*stride;
 }
 
-bool VertexArray::ArrayMask::is_set(unsigned bit) const
+unsigned VertexArray::get_data_size() const
 {
-	return mask[bit/B]&(1<<(bit%B));
+	return data.size()*sizeof(float);
 }
 
 
 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));