Convert VertexArray into a Bufferable

diff --git a/source/immediate.cpp b/source/immediate.cpp
index cbcc37b9e7d17490f355ec5ca2c2601cce27a811..cf1be08ed7204209d0d572b851ce76b7c58469ff 100644 (file)
--- 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 f8a7bcb215d8c5fd0bce934d23ddd16b7e8ea48d..f23c56c8b80c54e30b645984cc3d0b8d7747f7e5 100644 (file)
--- 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 3fca527d75aee2dba990a176a2415f514a537f92..e453a3f12a569a70f7868288647dee37c6f45b33 100644 (file)
--- 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 af1817b18461893591bc72c001db80c1dd72c0ce..fb8f51b026d82e40c2ef4dd70da31f2f3c66027f 100644 (file)
--- 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; }