From dada9c734cb887ecc69c1e4f282af3bf71af8c41 Mon Sep 17 00:00:00 2001 From: Morten Nobel-Joergensen Date: Mon, 23 Jul 2018 11:39:56 +0200 Subject: [PATCH] Fix sprite atlas bug --- include/sre/Renderer.hpp | 2 +- src/sre/SpriteBatch.cpp | 2 -- version-history.md | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/sre/Renderer.hpp b/include/sre/Renderer.hpp index f363a310..b98420d3 100755 --- a/include/sre/Renderer.hpp +++ b/include/sre/Renderer.hpp @@ -71,7 +71,7 @@ namespace sre { ~Renderer(); static constexpr int sre_version_major = 1; static constexpr int sre_version_minor = 1; - static constexpr int sre_version_point = 2; + static constexpr int sre_version_point = 3; glm::ivec2 getWindowSize(); // Return the current size of the window diff --git a/src/sre/SpriteBatch.cpp b/src/sre/SpriteBatch.cpp index 584e5028..db821e41 100644 --- a/src/sre/SpriteBatch.cpp +++ b/src/sre/SpriteBatch.cpp @@ -25,8 +25,6 @@ namespace sre{ std::sort(sprites.begin(), sprites.end(), [](const Sprite & a,const Sprite & b){ return a.order.globalOrder < b.order.globalOrder; }); - auto& s0 = sprites[0]; - auto& s1 = sprites[1]; std::vector vertices; std::vector colors; std::vector uvs; diff --git a/version-history.md b/version-history.md index 09aa26a5..81c8f7b2 100644 --- a/version-history.md +++ b/version-history.md @@ -1,5 +1,6 @@ ## Version history + * 1.1.3 Fix sprite atlas bug (Windows). * 1.1.2 Maintain uniforms on shader recompile. Add ImGui_RenderTexture(). Add SDLRenderer::setWindowIcon(). More strict resource management for shader code. * 1.1.1 Libraries as submodules. Mesh::MeshBuilder::recomputeNormals(). Mesh::MeshBuilder::recomputeTangents(). * 1.1.0 Shadowmap support. Mesh indices 32 bit option (now uses uint32_t for mesh indices instead of uint16_t). Fixed Camera::screenPointToRay for scaled/offset viewport.