Improving api

3 files changed, 13 insertions, 15 deletions

diff --git a/yage/core/camera2d.cpp b/yage/core/camera2d.cpp
index 52c5c50f..d5640c3f 100644
--- a/yage/core/camera2d.cpp
+++ b/yage/core/camera2d.cpp
@@ -6,14 +6,6 @@
  * ----------------------------------------------------------------------------
  */
 
-/* ----------------------------------------------------------------------------
- * camera2d.cpp
- *
- * Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License
- * See file LICENSE for more details
- * ----------------------------------------------------------------------------
- */
-
 #include "camera2d.h"
 
 #include <glad/glad.h>
diff --git a/yage/core/spritebatch.cpp b/yage/core/spritebatch.cpp
index 00673c08..98213467 100644
--- a/yage/core/spritebatch.cpp
+++ b/yage/core/spritebatch.cpp
@@ -30,7 +30,10 @@ RenderBatch::RenderBatch(GLint offset, GLsizei num_vertices, GLuint texture)
 {
 }
 
-SpriteBatch::SpriteBatch() = default;
+SpriteBatch::SpriteBatch()
+{
+    createVertexArray();
+}
 
 SpriteBatch::~SpriteBatch()
 {
@@ -43,11 +46,6 @@ SpriteBatch::~SpriteBatch()
     }
 }
 
-void SpriteBatch::init()
-{
-    createVertexArray();
-}
-
 void SpriteBatch::begin()
 {
     glyphs_.clear();
@@ -94,12 +92,21 @@ void SpriteBatch::draw(const yage::Vector4f &destination_rect,
 
 void SpriteBatch::render()
 {
+    // sort and create render batches
+    sortGlyphs();
+    createRenderBatches();
+
     glBindVertexArray(vao_);
     for (auto &&batch : render_batches_) {
         glBindTexture(GL_TEXTURE_2D, batch.texture());
         glDrawArrays(GL_TRIANGLES, batch.offset(), batch.num_vertices());
     }
     glBindVertexArray(0);
+
+    // clear and reset the vectors
+    glyphs_.clear();
+    glyph_ptrs_.clear();
+    render_batches_.clear();
 }
 
 void SpriteBatch::createVertexArray()
diff --git a/yage/core/spritebatch.h b/yage/core/spritebatch.h
index 9ec7cffb..d90d6d05 100644
--- a/yage/core/spritebatch.h
+++ b/yage/core/spritebatch.h
@@ -89,7 +89,6 @@ public:
     SpriteBatch &operator=(SpriteBatch &&) = delete;
 
     // initialize vaos and vbos
-    void init();
     void begin();
     void end();