X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fvertexarray.cpp;h=3848109973c9dca9c8c49c830ebfa10e0285c6e9;hb=e720536d5feacf6136b5621c98b72d206e44f64c;hp=5065f305c3575920411b6d8ebfc707f61b6aabb3;hpb=619aae12e01f25e79626a94c973927e5599e99a5;p=libs%2Fgl.git

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 5065f305..38481099 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -3,6 +3,7 @@
 #include "buffer.h"
 #include "error.h"
 #include "gl.h"
+#include "mesh.h"
 #include "vertexarray.h"
 
 using namespace std;
@@ -10,9 +11,7 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-VertexArray::VertexArray(const VertexFormat &f):
-	defer_vbuf(true),
-	dirty(false)
+VertexArray::VertexArray(const VertexFormat &f)
 {
 	reset(f);
 }
@@ -36,7 +35,7 @@ void VertexArray::reset(const VertexFormat &f)
 
 	arrays.clear();
 
-	unsigned offset = 0;
+	unsigned offs = 0;
 	for(const unsigned char *c=format.begin(); c!=format.end(); ++c)
 	{
 		unsigned slot = get_array_slot(*c);
@@ -45,9 +44,9 @@ void VertexArray::reset(const VertexFormat &f)
 
 		Array &arr = arrays[slot];
 		arr.component = *c;
-		arr.offset = offset;
+		arr.offset = offs;
 
-		offset += get_component_size(*c);
+		offs += get_component_size(*c);
 	}
 }
 
@@ -76,24 +75,6 @@ unsigned VertexArray::get_array_slot(unsigned char comp)
 	}
 }
 
-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()
 {
 	data.clear();
@@ -107,30 +88,28 @@ void VertexArray::reserve(unsigned n)
 float *VertexArray::append()
 {
 	data.insert(data.end(), stride, 0.0f);
-	set_dirty();
+	dirty = true;
 	return &*(data.end()-stride);
 }
 
 float *VertexArray::modify(unsigned i)
 {
-	set_dirty();
+	dirty = true;
 	return &data[0]+i*stride;
 }
 
-void VertexArray::set_dirty()
+unsigned VertexArray::get_data_size() const
 {
-	dirty = true;
-	if(defer_vbuf)
-	{
-		vbuf = new Buffer(ARRAY_BUFFER);
-		defer_vbuf = false;
-	}
+	return data.size()*sizeof(float);
 }
 
 void VertexArray::apply() const
 {
 	if(format.empty())
 		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
@@ -140,22 +119,14 @@ void VertexArray::apply() const
 	if(!set_current(this) && !dirty)
 		return;
 
-	if(vbuf)
-	{
-		vbuf->bind_to(ARRAY_BUFFER);
-		if(dirty)
-		{
-			vbuf->data(data.size()*sizeof(float), &data[0]);
-			dirty = false;
-		}
-	}
+	Buffer *vbuf = get_buffer();
+	Bind _bind_vbuf(vbuf, ARRAY_BUFFER);
+	if(vbuf && dirty)
+		update_buffer();
 
-	const float *base = (vbuf ? 0 : &data[0]);
+	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)
-		Buffer::unbind_from(ARRAY_BUFFER);
 }
 
 void VertexArray::apply_arrays(const vector<Array> *arrays, const vector<Array> *old_arrays, const float *base, unsigned stride_bytes)