Rename batch's data_type to index_type

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

diff --git a/source/batch.h b/source/batch.h
index 0d05d6d4ff39aeec2b5c7662f22254c09db2c420..6fb013af68e8de626757392a2e4644d9c734d2d8 100644 (file)
--- a/source/batch.h
+++ b/source/batch.h
@@ -33,8 +33,8 @@ public:
 
 private:
        PrimitiveType prim_type;
-       DataType data_type;
-       std::vector<unsigned char> data;
+       DataType index_type;
+       std::vector<UInt8> data;
        unsigned min_index;
        unsigned max_index;
        bool restart;
@@ -46,13 +46,16 @@ public:
        ~Batch();
 
        PrimitiveType get_type() const { return prim_type; }
-       void set_data_type(DataType);
-       DataType get_data_type() const { return data_type; }
+       void set_index_type(DataType);
+       DataType get_index_type() const { return index_type; }
+
+       DEPRECATED void set_data_type(DataType t) { set_index_type(t); }
+       DEPRECATED DataType get_data_type() const { return index_type; }
 
        Batch &append(unsigned);
-       void append(const std::vector<unsigned> &);
+       Batch &append(const std::vector<unsigned> &);
        bool can_append(PrimitiveType);
-       void append(const Batch &);
+       Batch &append(const Batch &);
 private:
        void append_index(unsigned);
        virtual unsigned get_data_size() const { return data.size(); }
@@ -65,7 +68,9 @@ public:
        unsigned get_index(unsigned) const;
 
        void draw() const;
+       void draw_instanced(unsigned) const;
 private:
+       const void *setup_draw() const;
        static void set_restart_index(unsigned);
 };