Use friend declaration to access hidden data in Batch

diff --git a/source/core/batch.h b/source/core/batch.h
index 41dac24a1a57b8bef3abb4a657ee9e88572c9001..e03435550aa48857632aff62d4624eb69f871866 100644 (file)
--- a/source/core/batch.h
+++ b/source/core/batch.h
@@ -22,6 +22,8 @@ class.
 */
 class Batch: public Bufferable
 {
+       friend class Commands;
+
 public:
        class Loader: public DataFile::ObjectLoader<Batch>
        {
@@ -44,10 +46,8 @@ public:
        ~Batch();
 
        PrimitiveType get_type() const { return prim_type; }
-       unsigned get_gl_primitive_type() const { return gl_prim_type; }
        void set_index_type(DataType);
        DataType get_index_type() const { return index_type; }
-       unsigned get_gl_index_type() const { return gl_index_type; }
 
        Batch &append(unsigned);
        Batch &append(const std::vector<unsigned> &);

diff --git a/source/core/commands.cpp b/source/core/commands.cpp
index a0a4336ade77c6951a1fd511e884e7f6e9dd0f7c..ebc6394e44b4eaca1883e31f744f0b40a317ec41 100644 (file)
--- a/source/core/commands.cpp
+++ b/source/core/commands.cpp
@@ -72,7 +72,7 @@ void Commands::draw(const Batch &batch)
 {
        pipeline_state->apply();
        void *data_ptr = reinterpret_cast<void *>(batch.get_offset());
-       glDrawElements(batch.get_gl_primitive_type(), batch.size(), batch.get_gl_index_type(), data_ptr);
+       glDrawElements(batch.gl_prim_type, batch.size(), batch.gl_index_type, data_ptr);
 }
 
 void Commands::draw_instanced(const Batch &batch, unsigned count)
@@ -81,7 +81,7 @@ void Commands::draw_instanced(const Batch &batch, unsigned count)
 
        pipeline_state->apply();
        void *data_ptr = reinterpret_cast<void *>(batch.get_offset());
-       glDrawElementsInstanced(batch.get_gl_primitive_type(), batch.size(), batch.get_gl_index_type(), data_ptr, count);
+       glDrawElementsInstanced(batch.gl_prim_type, batch.size(), batch.gl_index_type, data_ptr, count);
 }
 
 void Commands::resolve_multisample(Framebuffer &target)