From cfd7b5bc0c69d0b8cc7c8b3ec81a1a9462d04abb Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sat, 30 Nov 2013 18:55:10 +0200
Subject: [PATCH] Convert VertexArray into a Bufferable

---
 source/immediate.cpp   |  2 +-
 source/mesh.cpp        |  4 ++--
 source/vertexarray.cpp | 33 +++++++++++++++------------------
 source/vertexarray.h   | 10 ++++++----
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/source/immediate.cpp b/source/immediate.cpp
index cbcc37b9..cf1be08e 100644
--- a/source/immediate.cpp
+++ b/source/immediate.cpp
@@ -9,7 +9,7 @@ Immediate::Immediate(VertexFormat f):
 	PrimitiveBuilder(array),
 	array(f)
 {
-	array.use_vertex_buffer(0);
+	array.use_buffer(0);
 }
 
 void Immediate::reset()
diff --git a/source/mesh.cpp b/source/mesh.cpp
index f8a7bcb2..f23c56c8 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -42,7 +42,7 @@ void Mesh::use_buffers(bool b)
 		create_buffers();
 	else
 	{
-		vertices.use_vertex_buffer(0);
+		vertices.use_buffer(0);
 		delete vbuf;
 		vbuf = 0;
 		delete ibuf;
@@ -56,7 +56,7 @@ void Mesh::create_buffers()
 
 	if(!vbuf)
 		vbuf = new Buffer(ARRAY_BUFFER);
-	vertices.use_vertex_buffer(vbuf);
+	vertices.use_buffer(vbuf);
 
 	if(!ibuf)
 		ibuf = new Buffer(ELEMENT_ARRAY_BUFFER);
diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 3fca527d..e453a3f1 100644
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -35,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);
@@ -44,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);
 	}
 }
 
@@ -75,12 +75,6 @@ unsigned VertexArray::get_array_slot(unsigned char comp)
 	}
 }
 
-void VertexArray::use_vertex_buffer(Buffer *b)
-{
-	vbuf = b;
-	dirty = true;
-}
-
 void VertexArray::clear()
 {
 	data.clear();
@@ -94,19 +88,24 @@ 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;
+	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
@@ -122,17 +121,15 @@ void VertexArray::apply() const
 	if(!set_current(this) && !dirty)
 		return;
 
+	Buffer *vbuf = get_buffer();
 	if(vbuf)
 	{
 		vbuf->bind_to(ARRAY_BUFFER);
 		if(dirty)
-		{
-			vbuf->data(data.size()*sizeof(float), &data[0]);
-			dirty = false;
-		}
+			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);
 
diff --git a/source/vertexarray.h b/source/vertexarray.h
index af1817b1..fb8f51b0 100644
--- a/source/vertexarray.h
+++ b/source/vertexarray.h
@@ -6,6 +6,7 @@
 #include <msp/core/refptr.h>
 #include <msp/datafile/loader.h>
 #include "bindable.h"
+#include "bufferable.h"
 #include "datatype.h"
 #include "primitivetype.h"
 #include "vertexarraybuilder.h"
@@ -16,7 +17,7 @@ namespace GL {
 
 class Buffer;
 
-class VertexArray: public Bindable<VertexArray>
+class VertexArray: public Bindable<VertexArray>, public Bufferable
 {
 public:
 	class Loader: public DataFile::Loader, public VertexArrayBuilder
@@ -38,7 +39,6 @@ private:
 	std::vector<float> data;
 	unsigned stride;
 	std::vector<Array> arrays;
-	Buffer *vbuf;
 	mutable bool dirty;
 
 	VertexArray(const VertexArray &);
@@ -53,14 +53,16 @@ private:
 	static unsigned get_array_slot(unsigned char);
 
 public:
-	void use_vertex_buffer(Buffer *);
+	/// Deprecated alias for use_buffer
+	void use_vertex_buffer(Buffer *b) { use_buffer(b); }
 
 	void clear();
 	void reserve(unsigned);
 	float *append();
 	float *modify(unsigned);
 private:
-	void set_dirty();
+	virtual unsigned get_data_size() const;
+	virtual void upload_data() const;
 
 public:
 	unsigned size() const { return data.size()/stride; }
-- 
2.45.2