Sprite and Shape use ptrs (#92)

* Sprite and Shape use ptrs
JerboaBurrow · Sep 11, 2024 · e90cc2f · e90cc2f
1 parent 122773e
commit e90cc2f
Show file tree

Hide file tree

Showing 25 changed files with 570 additions and 349 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -76,7 +76,6 @@ if (ANDROID)
         "src/font.cpp"
         "src/glyph.cpp"
         "src/shader.cpp"
-        "src/spriteRenderer.cpp"
         "src/warning.cpp"
         "src/jGL/common.cpp"
         "src/id.cpp"
@@ -161,7 +160,6 @@ IF (TEST_SUITE)
         "src/jGL/OpenGL/*.cpp"
         "src/jGL/shader.cpp"
         "src/jGL/warning.cpp"
-        "src/jGL/spriteRenderer.cpp"
         "src/id.cpp"
         "src/jGL/Display/*.cpp"
         "src/jGL/common.cpp"
@@ -219,7 +217,6 @@ IF (TEST_SUITE)
         ${TEST_SRC}
         "src/jGL/shader.cpp"
         "src/jGL/warning.cpp"
-        "src/jGL/spriteRenderer.cpp"
         "src/id.cpp"
         "src/jGL/font.cpp"
         "src/jGL/glyph.cpp"

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,3 +1,4 @@
 add_subdirectory(Particles)
 add_subdirectory(Sprite)
-add_subdirectory(Shape)
+add_subdirectory(Shape)
+add_subdirectory(SpriteBenchmark)
diff --git a/examples/Shape/main.cpp b/examples/Shape/main.cpp
@@ -33,8 +33,9 @@ int main(int argv, char ** argc)
     jGLInstance->setTextProjection(glm::ortho(0.0,double(resX),0.0,double(resY)));
     jGLInstance->setMSAA(1);
 
-    std::vector<std::shared_ptr<jGL::Shape>> shapes;
+    std::vector<jGL::Shape> shapes;
     std::vector<jGL::Transform> trans;
+    std::vector<glm::vec4> cols;
 
     RNG rng;
     uint64_t n = 1000000;
@@ -46,16 +47,17 @@ int main(int argv, char ** argc)
 
     shapes.reserve(n);
     trans.reserve(n);
+    cols.reserve(n);
     for (unsigned i = 0; i < n; i++)
     {
         trans.push_back(jGL::Transform(rng.nextFloat(), rng.nextFloat(), 0.0, 0.001f));
+        cols.push_back(glm::vec4(rng.nextFloat(), rng.nextFloat(), rng.nextFloat(), 1.0));
         shapes.push_back
         (
-            std::make_shared<jGL::Shape>
-            (
-                trans[i],
-                glm::vec4(rng.nextFloat(), rng.nextFloat(), rng.nextFloat(), 1.0)
-            )
+            {
+                &trans[i],
+                &cols[i]
+            }
         );
 
         circles->add(shapes[i], std::to_string(i));