g# This is a combination of 2 commits.

set projection in example must rebind textures before draw, redesign it
JerboaBurrow · Nov 2, 2023 · 8679baf · 8679baf
1 parent b91ca9b
commit 8679baf
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 66 deletions.
diff --git a/examples/Sprite/main.cpp b/examples/Sprite/main.cpp
@@ -26,60 +26,26 @@ int main(int argv, char ** argc)
 
     std::shared_ptr<jGL::Texture> heart = jGLInstance->createTexture
     (
-        "resource/texture/HEART.png",
+        "resource/texture/saturn.png",
         jGL::Texture::Type::RGBA
     );
 
-    heart->bind(0);
-
-    std::shared_ptr<jGL::Texture> Pi = jGLInstance->createTexture
-    (
-        "resource/texture/Pi.png",
-        jGL::Texture::Type::RGBA
-    );
-
-    Pi->bind(1);
-
-    std::shared_ptr<jGL::Texture> random = jGLInstance->createTexture
-    (
-        "resource/texture/random.png",
-        jGL::Texture::Type::RGBA
-    );
-
-    random->bind(2);
-
     std::shared_ptr<jGL::SpriteRenderer> sprites = jGLInstance->createSpriteRenderer
     (
-        3
+        1
     );
+
+    sprites->setProjection(camera.getVP());
 
     sprites->add
     (
         {
-            jGL::Transform(0.0f, 0.0f, 0.0f, 1.0f),
+            jGL::Transform(0.5f, 0.5f, 0.0f, 0.5f),
             jGL::TextureOffset(0.0f, 0.0f, 0)
         },
         "sHeart"
     );
 
-    sprites->add
-    (
-        {
-            jGL::Transform(0.0f, 0.0f, 0.0f, 1.0f),
-            jGL::TextureOffset(0.0f, 0.0f, 0)
-        },
-        "sPi"
-    );
-
-    sprites->add
-    (
-        {
-            jGL::Transform(0.0f, 0.0f, 0.0f, 1.0f),
-            jGL::TextureOffset(0.0f, 0.0f, 0)
-        },
-        "sRandom"
-    );
-
     double delta = 0.0;
 
     while (display.isOpen())
@@ -88,7 +54,8 @@ int main(int argv, char ** argc)
 
         jGLInstance->clear();
 
-        sprites->draw({"sHeart", "sPi", "sRandom"});
+        heart->bind(0);
+        sprites->draw({"sHeart"});
 
         delta = 0.0;
         for (int n = 0; n < 60; n++)

diff --git a/examples/Sprite/resource/texture/saturn.png b/examples/Sprite/resource/texture/saturn.png
diff --git a/include/jGL/OpenGL/glSpriteRenderer.h b/include/jGL/OpenGL/glSpriteRenderer.h
@@ -17,7 +17,10 @@ namespace jGL::GL
             offsets = std::vector<float>(sizeHint*4+padSprites*4,0.0f);
             textureOffsets = std::vector<float>(sizeHint*3+padSprites*3,0.0f);
             initGL();
-            defaultShader = std::make_shared<glShader>(vertexShader, fragmentShader);
+            defaultShader = std::static_pointer_cast<Shader>
+            (
+                std::make_shared<glShader>(vertexShader, fragmentShader)
+            );
             defaultShader->use();
         }
 
@@ -45,8 +48,7 @@ namespace jGL::GL
         };
 
         std::vector<float> offsets;         // offset x, y, theta, scale
-        std::vector<float> textureOffsets;  // tx, ty (atlas coords)
-        std::vector<uint8_t> textureUnits;  // texture unit
+        std::vector<float> textureOffsets;  // tx, ty (atlas coords), texture unit
 
         size_t padSprites = 8;
 

diff --git a/include/jGL/spriteRenderer.h b/include/jGL/spriteRenderer.h
@@ -18,7 +18,7 @@ namespace jGL
 
     public:
 
-        SpriteRenderer(size_t sizeHint = 64)
+        SpriteRenderer(size_t sizeHint = 8)
         {
             sprites.reserve(sizeHint); 
         }

diff --git a/src/jGL/OpenGL/glSpriteRenderer.cpp b/src/jGL/OpenGL/glSpriteRenderer.cpp
@@ -30,36 +30,46 @@ namespace jGL::GL
         shader->use();
 
         shader->setUniform<glm::mat4>("proj", projection);
-        shader->setUniform<Sampler2D>("sampler", 0);
+        shader->setUniform<Sampler2D>("sampler", Sampler2D(0));
 
         glBindVertexArray(vao);
 
-        glBindBuffer(GL_ARRAY_BUFFER, a_offset);
-            glBufferSubData
-            (
-                GL_ARRAY_BUFFER,
-                0,
-                4*n*sizeof(float),
-                &offsets[0]
-            );
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
-
-        glBindBuffer(GL_ARRAY_BUFFER, a_textureOffset);
+            glBindBuffer(GL_ARRAY_BUFFER, a_offset);
+                glBufferSubData
+                (
+                    GL_ARRAY_BUFFER,
+                    0,
+                    4*n*sizeof(float),
+                    &offsets[0]
+                );
+            glBindBuffer(GL_ARRAY_BUFFER, 0);
+
+            glBindBuffer(GL_ARRAY_BUFFER, a_textureOffset);
+
+                glBufferSubData
+                (
+                    GL_ARRAY_BUFFER,
+                    0,
+                    3*n*sizeof(float),
+                    &textureOffsets[0]
+                );
+
+            glBindBuffer(GL_ARRAY_BUFFER, 0);
 
-            glBufferSubData
-            (
-                GL_ARRAY_BUFFER,
-                0,
-                3*n*sizeof(float),
-                &textureOffsets[0]
-            );
+        glBindVertexArray(0);
 
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
+        glBindVertexArray(vao);
 
-        glDrawArraysInstanced(GL_TRIANGLES, 0, 6, n);
+            glEnable(GL_BLEND);
+            glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+            glDisable(GL_DEPTH_TEST);
+
+            glDrawArraysInstanced(GL_TRIANGLES, 0, 6, n);
 
         glBindVertexArray(0);
 
+        glError("sprite draw");
+
     }
 
     void glSpriteRenderer::freeGL()
@@ -84,7 +94,7 @@ namespace jGL::GL
                 glBufferData
                 (
                     GL_ARRAY_BUFFER,
-                    sizeof(quad),
+                    sizeof(float)*6*4,
                     &quad[0],
                     GL_STATIC_DRAW
                 );
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ namespace jGL @@
         public:
-            SpriteRenderer(size_t sizeHint = 64)
+            SpriteRenderer(size_t sizeHint = 8)
             {
                 sprites.reserve(sizeHint);
             }
@@ Expand Down @@