Merge pull request #38 from mortennobel/develop

1.1.3
mortennobel · Jul 23, 2018 · 4b31771 · 4b31771
2 parents 7e52507 + dada9c7
commit 4b31771
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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<glm::vec3> vertices;
         std::vector<glm::vec4> colors;
         std::vector<glm::vec4> uvs;

diff --git 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.