aboutsummaryrefslogtreecommitdiffstats
path: root/yage/render/spritebatch.cpp
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-12-27 21:24:48 +0000
committerYann Herklotz <ymherklotz@gmail.com>2017-12-27 21:24:48 +0000
commitd2ed94a517066da4f4ec53045f9c69bfc355eab6 (patch)
tree4aba7b767826ddd05279c12b5b0c5da592c200cb /yage/render/spritebatch.cpp
parent354d7df4d2779ed7391701d1ef4344e959b64582 (diff)
downloadYAGE-d2ed94a517066da4f4ec53045f9c69bfc355eab6.tar.gz
YAGE-d2ed94a517066da4f4ec53045f9c69bfc355eab6.zip
[Code] Examples working again.
Diffstat (limited to 'yage/render/spritebatch.cpp')
-rw-r--r--yage/render/spritebatch.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/yage/render/spritebatch.cpp b/yage/render/spritebatch.cpp
index fb6c3d78..c1bf4a28 100644
--- a/yage/render/spritebatch.cpp
+++ b/yage/render/spritebatch.cpp
@@ -9,6 +9,7 @@
#include "spritebatch.h"
#include <algorithm>
+#include <iostream>
#include <stdexcept>
namespace yage
@@ -88,10 +89,9 @@ void SpriteBatch::draw(const glm::vec4 &destination_rect,
void SpriteBatch::render()
{
// sort and create render batches
- glBindVertexArray(vao_);
sortGlyphs();
createRenderBatches();
-
+ glBindVertexArray(vao_);
for (auto &&batch : render_batches_) {
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, batch.texture);
@@ -155,6 +155,7 @@ void SpriteBatch::createRenderBatches()
glyph_ptrs_[i - 1]->texture()))) {
render_batches_.emplace_back(i * NUM_VERTICES, NUM_VERTICES,
glyph_ptrs_[i]->texture());
+
} else {
render_batches_.back().num_vertices += NUM_VERTICES;
}