Better naming algorithm for objects in scene export

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

diff --git a/source/batch.h b/source/batch.h
index 2b907d4846bc0032e51f1160678b48d779a6350f..10c61a289e2e5afb71e94c6049126ee4fcbfe877 100644 (file)
--- a/source/batch.h
+++ b/source/batch.h
@@ -1,21 +1,26 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007, 2009-2010 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_BATCH_H_
 #define MSP_GL_BATCH_H_
 
 #include <vector>
 #include <msp/datafile/objectloader.h>
+#include "bufferable.h"
+#include "datatype.h"
 #include "primitivetype.h"
 
 namespace Msp {
 namespace GL {
 
-class Batch
+class Buffer;
+
+/**
+Stores primitive type and element indices for a single GL draw call.  Data
+type for indices is automatically chosen to accommodate the largest index in
+the Batch.
+
+This is a pretty low-level class and mainly intended to be used by the Mesh
+class.
+*/
+class Batch: public Bufferable
 {
 public:
        class Loader: public DataFile::ObjectLoader<Batch>
@@ -27,21 +32,41 @@ public:
        };
 
 private:
-       PrimitiveType type;
-       std::vector<unsigned> indices;
+       PrimitiveType prim_type;
+       DataType data_type;
+       std::vector<unsigned char> data;
        unsigned min_index;
        unsigned max_index;
+       bool restart;
+
+       static unsigned restart_index;
 
 public:
        Batch(PrimitiveType t);
+       ~Batch();
+
+       PrimitiveType get_type() const { return prim_type; }
+       void set_data_type(DataType);
+       DataType get_data_type() const { return data_type; }
 
        Batch &append(unsigned);
-       void append(const std::vector<unsigned> &);
-       PrimitiveType get_type() const { return type; }
-       unsigned size() const { return indices.size(); }
-       const std::vector<unsigned> &get_indices() const { return indices; }
+       Batch &append(const std::vector<unsigned> &);
+       bool can_append(PrimitiveType);
+       Batch &append(const Batch &);
+private:
+       void append_index(unsigned);
+       virtual unsigned get_data_size() const { return data.size(); }
+       virtual const void *get_data_pointer() const { return &data[0]; }
+       virtual unsigned get_alignment() const { return get_index_size(); }
+       unsigned get_index_size() const;
+public:
+       unsigned size() const { return data.size()/get_index_size(); }
+
+       unsigned get_index(unsigned) const;
+
        void draw() const;
-       void draw_with_buffer(unsigned) const;
+private:
+       static void set_restart_index(unsigned);
 };
 
 } // namespace GL