]> git.tdb.fi Git - libs/gl.git/blobdiff - source/batch.cpp
Check the flat qualifier from the correct member
[libs/gl.git] / source / batch.cpp
diff --git a/source/batch.cpp b/source/batch.cpp
deleted file mode 100644 (file)
index b4b8817..0000000
+++ /dev/null
@@ -1,341 +0,0 @@
-#include "batch.h"
-#include "bindable.h"
-#include "buffer.h"
-#include "error.h"
-#include "extension.h"
-#include "nv_primitive_restart.h"
-#include "vertexarray.h"
-
-using namespace std;
-
-namespace Msp {
-namespace GL {
-
-unsigned Batch::restart_index = 0;
-
-Batch::Batch(PrimitiveType t):
-       prim_type(t),
-       data_type(UNSIGNED_BYTE),
-       min_index(0),
-       max_index(0),
-       restart(false),
-       ibuf(0),
-       ibuf_offset(0),
-       next_in_ibuf(0),
-       prev_in_ibuf(0),
-       dirty(false)
-{ }
-
-Batch::~Batch()
-{
-       unlink_from_ibuf();
-}
-
-void Batch::set_data_type(DataType t)
-{
-       if(t!=UNSIGNED_BYTE && t!=UNSIGNED_SHORT && t!=UNSIGNED_INT)
-               throw invalid_argument("Batch::set_data_type");
-       if(t==UNSIGNED_BYTE && max_index>0xFE)
-               throw invalid_operation("Batch::set_data_type");
-       else if(t==UNSIGNED_SHORT && max_index>0xFFFE)
-               throw invalid_operation("Batch::set_data_type");
-
-       if(data_type==UNSIGNED_BYTE && t==UNSIGNED_SHORT)
-               expand_data<unsigned char, unsigned short>();
-       else if(data_type==UNSIGNED_BYTE && t==UNSIGNED_INT)
-               expand_data<unsigned char, unsigned>();
-       else if(data_type==UNSIGNED_SHORT && t==UNSIGNED_INT)
-               expand_data<unsigned short, unsigned>();
-       else if(data_type==UNSIGNED_INT && t==UNSIGNED_BYTE)
-               shrink_data<unsigned, unsigned char>();
-       else if(data_type==UNSIGNED_INT && t==UNSIGNED_SHORT)
-               shrink_data<unsigned, unsigned short>();
-       else if(data_type==UNSIGNED_SHORT && t==UNSIGNED_BYTE)
-               shrink_data<unsigned short, unsigned char>();
-
-       data_type = t;
-       update_ibuf_offsets();
-       dirty = true;
-}
-
-void Batch::use_index_buffer(Buffer *buf, Batch *prev)
-{
-       if(buf && prev && prev->ibuf!=buf)
-               throw invalid_argument("Batch::use_index_buffer");
-
-       if(!buf)
-       {
-               prev = 0;
-               unlink_from_ibuf();
-       }
-
-       ibuf = buf;
-       prev_in_ibuf = prev;
-       next_in_ibuf = 0;
-       if(prev)
-       {
-               prev->next_in_ibuf = this;
-               ibuf_offset = prev->ibuf_offset+prev->data.size();
-       }
-       else
-               ibuf_offset = 0;
-
-       dirty = true;
-}
-
-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);
-
-       if(data_type==UNSIGNED_SHORT)
-               append_index<unsigned short>(i);
-       else if(data_type==UNSIGNED_INT)
-               append_index<unsigned>(i);
-       else
-               data.push_back(i);
-       
-       update_ibuf_offsets();
-       dirty = true;
-
-       return *this;
-}
-
-void Batch::append(const vector<unsigned> &ind)
-{
-       if(ind.empty())
-               return;
-
-       if(data.empty())
-               min_index = max_index = ind.front();
-
-       for(vector<unsigned>::const_iterator i=ind.begin(); i!=ind.end(); ++i)
-       {
-               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);
-
-       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];
-       }
-       else
-       {
-               for(unsigned i=0; i<ind.size(); ++i)
-                       data[base+i] = ind[i];
-       }
-}
-
-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)
-               static RequireExtension _ext("GL_NV_primitive_restart");
-
-       if(other.data.empty())
-               return;
-
-       if(is_supported("GL_NV_primitive_restart"))
-       {
-               restart = true;
-               if(data_type==UNSIGNED_SHORT)
-                       append_index<unsigned short>(0xFFFF);
-               else if(data_type==UNSIGNED_INT)
-                       append_index<unsigned>(0xFFFFFFFF);
-               else
-                       data.push_back(0xFF);
-       }
-       else if(prim_type==TRIANGLE_STRIP)
-       {
-               append(get_index(size()-1));
-               append(other.get_index(0));
-               if(size()&1)
-                       append(other.get_index(0));
-       }
-       else if(prim_type==QUAD_STRIP)
-       {
-               append(get_index(size()-1));
-               append(get_index(size()-1));
-               append(other.get_index(0));
-               append(other.get_index(0));
-       }
-
-       unsigned count = other.size();
-       for(unsigned i=0; i<count; ++i)
-               append(other.get_index(i));
-}
-
-void Batch::draw() const
-{
-       if(restart)
-       {
-               unsigned index;
-               if(data_type==UNSIGNED_SHORT)
-                       index = 0xFFFF;
-               else if(data_type==UNSIGNED_INT)
-                       index = 0xFFFFFFFF;
-               else
-                       index = 0xFF;
-
-               if(index!=restart_index)
-               {
-                       if(!restart_index)
-                               glEnableClientState(GL_PRIMITIVE_RESTART_NV);
-                       glPrimitiveRestartIndexNV(index);
-                       restart_index = index;
-               }
-       }
-       else if(restart_index && restart_index<max_index)
-       {
-               glDisableClientState(GL_PRIMITIVE_RESTART_NV);
-               restart_index = 0;
-       }
-
-       if(ibuf)
-       {
-               if(dirty)
-               {
-                       const Batch *b = this;
-                       for(; b->prev_in_ibuf; b=b->prev_in_ibuf) ;
-
-                       unsigned chain_size = 0;
-                       for(const Batch *a=b; a; a=a->next_in_ibuf)
-                               chain_size += a->data.size();
-
-                       ibuf->data(chain_size, 0);
-
-                       for(; b; b=b->next_in_ibuf)
-                       {
-                               ibuf->sub_data(b->ibuf_offset, b->data.size(), &b->data[0]);
-                               b->dirty = false;
-                       }
-               }
-
-               BufferAlias<ELEMENT_ARRAY_BUFFER> alias(*ibuf);
-               Bind bind_ibuf(alias, true);
-
-               glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, (void *)ibuf_offset);
-       }
-       else
-               glDrawRangeElements(prim_type, min_index, max_index, size(), data_type, &data[0]);
-}
-
-unsigned Batch::get_index_size() const
-{
-       if(data_type==UNSIGNED_SHORT)
-               return sizeof(unsigned short);
-       else if(data_type==UNSIGNED_INT)
-               return sizeof(unsigned);
-       return sizeof(unsigned char);
-}
-
-template<typename T>
-void Batch::append_index(T i)
-{
-       data.insert(data.end(), sizeof(T), 0);
-       *(T *)(&data[data.size()-sizeof(T)]) = i;
-}
-
-unsigned Batch::get_index(unsigned i) const
-{
-       if(data_type==UNSIGNED_SHORT)
-               return *(unsigned short *)&data[i*sizeof(unsigned short)];
-       else if(data_type==UNSIGNED_INT)
-               return *(unsigned *)&data[i*sizeof(unsigned )];
-       else
-               return data[i];
-}
-
-template<typename T, typename U>
-void Batch::expand_data()
-{
-       unsigned count = data.size()/sizeof(T);
-       data.resize(count*sizeof(U));
-       for(unsigned i=count; i--;)
-               *(U *)(&data[i*sizeof(U)]) = convert<T, U>(*(T *)(&data[i*sizeof(T)]));
-}
-
-template<typename T, typename U>
-void Batch::shrink_data()
-{
-       unsigned count = data.size()/sizeof(T);
-       for(unsigned i=0; i<count; ++i)
-               *(U *)(&data[i*sizeof(U)]) = convert<T, U>(*(T *)(&data[i*sizeof(T)]));
-       data.resize(count*sizeof(U));
-}
-
-template<typename T, typename U>
-U Batch::convert(T i) const
-{
-       if(!static_cast<T>(~i))
-               return ~0;
-       else
-               return i;
-}
-
-void Batch::unlink_from_ibuf()
-{
-       if(next_in_ibuf)
-               next_in_ibuf->prev_in_ibuf = prev_in_ibuf;
-       if(prev_in_ibuf)
-       {
-               prev_in_ibuf->next_in_ibuf = next_in_ibuf;
-               prev_in_ibuf->update_ibuf_offsets();
-       }
-       else if(next_in_ibuf)
-       {
-               next_in_ibuf->ibuf_offset = 0;
-               next_in_ibuf->update_ibuf_offsets();
-       }
-}
-
-void Batch::update_ibuf_offsets()
-{
-       for(Batch *b=this; b->next_in_ibuf; b=b->next_in_ibuf)
-               b->next_in_ibuf->ibuf_offset = b->ibuf_offset+b->data.size();
-}
-
-
-Batch::Loader::Loader(Batch &b):
-       DataFile::ObjectLoader<Batch>(b)
-{
-       add("indices", &Loader::indices);
-}
-
-void Batch::Loader::indices(const vector<unsigned> &ind)
-{
-       obj.append(ind);
-}
-
-} // namespace GL
-} // namespace Msp