Add vertex array object support to Mesh

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

diff --git a/source/batch.cpp b/source/batch.cpp
index 785fca826ae30e5c9c524b0a2f08a242a2aad15f..bca33484ce976cc585d8da88187c8ba568baed23 100644 (file)
--- a/source/batch.cpp
+++ b/source/batch.cpp
@@ -1,9 +1,10 @@
+#include <msp/gl/extensions/ext_draw_range_elements.h>
+#include <msp/gl/extensions/nv_primitive_restart.h>
 #include "batch.h"
 #include "bindable.h"
 #include "buffer.h"
 #include "error.h"
-#include "ext_draw_range_elements.h"
-#include "nv_primitive_restart.h"
+#include "mesh.h"
 #include "vertexarray.h"
 
 using namespace std;
@@ -96,26 +97,8 @@ void Batch::set_data_type(DataType t)
 
 Batch &Batch::append(unsigned i)
 {
-       if(data.empty())
-               min_index = max_index = i;
-       else
-       {
-               min_index = min(min_index, i);
-               max_index = max(max_index, i);
-       }
-
-       if((data_type==UNSIGNED_BYTE || data_type==UNSIGNED_SHORT) && max_index>0xFFFE)
-               set_data_type(UNSIGNED_INT);
-       else if(data_type==UNSIGNED_BYTE && max_index>0xFE)
-               set_data_type(UNSIGNED_SHORT);
+       append_index(i);
 
-       if(data_type==UNSIGNED_SHORT)
-               ::append<unsigned short>(data, i);
-       else if(data_type==UNSIGNED_INT)
-               ::append<unsigned>(data, i);
-       else
-               data.push_back(i);
-       
        update_offset();
        dirty = true;
 
@@ -127,57 +110,37 @@ void Batch::append(const vector<unsigned> &ind)
        if(ind.empty())
                return;
 
-       if(data.empty())
-               min_index = max_index = ind.front();
-
+       data.reserve(data.size()+ind.size()*get_index_size());
        for(vector<unsigned>::const_iterator i=ind.begin(); i!=ind.end(); ++i)
-       {
-               min_index = min(min_index, *i);
-               max_index = max(max_index, *i);
-       }
+               append_index(*i);
 
-       if((data_type==UNSIGNED_BYTE || data_type==UNSIGNED_SHORT) && max_index>0xFFFE)
-               set_data_type(UNSIGNED_INT);
-       else if(data_type==UNSIGNED_BYTE && max_index>0xFE)
-               set_data_type(UNSIGNED_SHORT);
+       update_offset();
+       dirty = true;
+}
 
-       unsigned base = data.size();
-       data.resize(data.size()+ind.size()*get_index_size());
-       if(data_type==UNSIGNED_SHORT)
-       {
-               unsigned short *ptr = reinterpret_cast<unsigned short *>(&data[base]);
-               for(unsigned i=0; i<ind.size(); ++i)
-                       ptr[i] = ind[i];
-       }
-       else if(data_type==UNSIGNED_INT)
-       {
-               unsigned *ptr = reinterpret_cast<unsigned *>(&data[base]);
-               for(unsigned i=0; i<ind.size(); ++i)
-                       ptr[i] = ind[i];
-       }
+bool Batch::can_append(PrimitiveType other_type)
+{
+       if(other_type!=prim_type)
+               return false;
+       else if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN || prim_type==POLYGON)
+               return NV_primitive_restart;
        else
-       {
-               for(unsigned i=0; i<ind.size(); ++i)
-                       data[base+i] = ind[i];
-       }
-       dirty = true;
+               return true;
 }
 
 void Batch::append(const Batch &other)
 {
        if(other.prim_type!=prim_type)
                throw invalid_argument("Batch::append");
-       if(prim_type==LINE_STRIP || prim_type==LINE_LOOP)
-               throw incompatible_data("Batch::append");
-       else if(prim_type==POLYGON)
-               throw incompatible_data("Batch::append");
-       else if(prim_type==TRIANGLE_FAN)
+       if(prim_type==LINE_STRIP || prim_type==LINE_LOOP || prim_type==TRIANGLE_FAN || prim_type==POLYGON)
                static Require _req(NV_primitive_restart);
 
        if(other.data.empty())
                return;
 
-       if(NV_primitive_restart)
+       if(prim_type==POINTS || prim_type==LINES || prim_type==TRIANGLES || prim_type==QUADS)
+               ;
+       else if(NV_primitive_restart)
        {
                restart = true;
                if(data_type==UNSIGNED_SHORT)
@@ -204,7 +167,33 @@ void Batch::append(const Batch &other)
 
        unsigned count = other.size();
        for(unsigned i=0; i<count; ++i)
-               append(other.get_index(i));
+               append_index(other.get_index(i));
+
+       update_offset();
+       dirty = true;
+}
+
+void Batch::append_index(unsigned i)
+{
+       if(data.empty())
+               min_index = max_index = i;
+       else
+       {
+               min_index = min(min_index, i);
+               max_index = max(max_index, i);
+       }
+
+       if((data_type==UNSIGNED_BYTE || data_type==UNSIGNED_SHORT) && max_index>0xFFFE)
+               set_data_type(UNSIGNED_INT);
+       else if(data_type==UNSIGNED_BYTE && max_index>0xFE)
+               set_data_type(UNSIGNED_SHORT);
+
+       if(data_type==UNSIGNED_SHORT)
+               ::append<unsigned short>(data, i);
+       else if(data_type==UNSIGNED_INT)
+               ::append<unsigned>(data, i);
+       else
+               data.push_back(i);
 }
 
 void Batch::upload_data() const
@@ -251,21 +240,33 @@ void Batch::draw() const
                        restart_index = index;
                }
        }
-       else if(restart_index && restart_index<max_index)
+       else if(restart_index && restart_index<=max_index)
        {
                glDisableClientState(GL_PRIMITIVE_RESTART_NV);
                restart_index = 0;
        }
 
-       if(get_buffer())
+       if(Buffer *ibuf = get_buffer())
        {
+               bool have_vao = Mesh::current();
+               const Buffer *old_ibuf = 0;
+               if(!have_vao)
+               {
+                       old_ibuf = Buffer::current(ELEMENT_ARRAY_BUFFER);
+                       ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
+               }
+
                if(dirty)
                        update_buffer();
 
-               BufferAlias<ELEMENT_ARRAY_BUFFER> alias(*get_buffer());
-               Bind bind_ibuf(alias, true);
-
                glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, reinterpret_cast<void *>(get_offset()));
+               if(!have_vao)
+               {
+                       if(old_ibuf)
+                               old_ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
+                       else
+                               Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
+               }
        }
        else
                glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, &data[0]);