Add append() method and and operator[] to VertexArray

[libs/gl.git] / source / vertexarray.cpp

diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp
index 6da0f9c0d44812ad6294d769200af558d5532bf0..c166e98718338c55bcfb175dde856d7c44e41c74 100644 (file)
--- a/source/vertexarray.cpp
+++ b/source/vertexarray.cpp
@@ -33,21 +33,30 @@ VertexArray::~VertexArray()
 
 void VertexArray::use_vertex_buffer()
 {
-       if(vbuf) return;
+       if(vbuf && own_vbuf)
+               return;
 
        vbuf=new VertexBuffer();
        own_vbuf=true;
+
        update_data();
 }
 
 void VertexArray::use_vertex_buffer(VertexBuffer *b)
 {
-       if(vbuf) return;
-
+       if(own_vbuf)
+               delete vbuf;
        vbuf=b;
+       own_vbuf=false;
+
        update_data();
 }
 
+void VertexArray::reserve(unsigned n)
+{
+       data.reserve(n*stride);
+}
+
 void VertexArray::clear()
 {
        data.clear();
@@ -62,11 +71,6 @@ void VertexArray::reset(VertexFormat f)
        stride=get_stride(format);
 }
 
-RefPtr<VertexArrayBuilder> VertexArray::modify()
-{
-       return new VertexArrayBuilder(*this, data);
-}
-
 void VertexArray::apply() const
 {
        if(format==NODATA)
@@ -78,29 +82,30 @@ void VertexArray::apply() const
        const float *base=vbuf?0:&data[0];
        uint offset=0;
        uint found=0;
+       uint bpv=stride*sizeof(float);
        for(uint fmt=format; fmt; fmt>>=4)
        {
-               uint size=(fmt&3)+1;
+               uint sz=(fmt&3)+1;
                switch(fmt&12)
                {
                case 0:
-                       glVertexPointer(size, GL_FLOAT, stride, base+offset);
+                       glVertexPointer(sz, GL_FLOAT, bpv, base+offset);
                        break;
                case 4:
-                       glNormalPointer(GL_FLOAT, stride, base+offset);
+                       glNormalPointer(GL_FLOAT, bpv, base+offset);
                        break;
                case 8:
-                       glTexCoordPointer(size, GL_FLOAT, stride, base+offset);
+                       glTexCoordPointer(sz, GL_FLOAT, bpv, base+offset);
                        break;
                case 12:
-                       if(size==1)
-                               glColorPointer(4, GL_UNSIGNED_BYTE, stride, base+offset);
+                       if(sz==1)
+                               glColorPointer(4, GL_UNSIGNED_BYTE, bpv, base+offset);
                        else
-                               glColorPointer(size, GL_FLOAT, stride, base+offset);
+                               glColorPointer(sz, GL_FLOAT, bpv, base+offset);
                        break;
                }
                found|=1<<((fmt&12)>>2);
-               offset+=size;
+               offset+=sz;
        }
 
        set_array(GL_VERTEX_ARRAY, found&1, 1);
@@ -108,7 +113,8 @@ void VertexArray::apply() const
        set_array(GL_TEXTURE_COORD_ARRAY, found&4, 4);
        set_array(GL_COLOR_ARRAY, found&8, 8);
 
-       VertexBuffer::unbind();
+       if(vbuf)
+               VertexBuffer::unbind();
 }
 
 /**
@@ -117,7 +123,16 @@ Updates the VertexArray data to the VertexBuffer tied to the array, if any.
 void VertexArray::update_data()
 {
        if(vbuf)
+       {
                vbuf->data(data.size()*sizeof(float), &data[0]);
+               VertexBuffer::unbind();
+       }
+}
+
+float *VertexArray::append()
+{
+       data.insert(data.end(), stride, 0.0f);
+       return &*data.end()-stride;
 }
 
 void VertexArray::set_array(unsigned array, unsigned bit, unsigned mask) const
@@ -138,7 +153,7 @@ unsigned VertexArray::enabled_arrays=0;
 
 
 VertexArray::Loader::Loader(VertexArray &a):
-       VertexArrayBuilder(a, a.data)
+       VertexArrayBuilder(a)
 {
        add("vertex2",   static_cast<void (Loader::*)(float, float)>(&Loader::vertex));
        add("vertex3",   static_cast<void (Loader::*)(float, float, float)>(&Loader::vertex));