Transfered changes

Author: JohnieWalkerCZ

main/CMakeLists.txt

@@ -19,10 +19,7 @@ idf_component_register(SRCS
     "examples/CollisionTest.cpp"
     "examples/Fire.cpp"
     "examples/Platformer.cpp"
-    "examples/SpaceShooter.cpp"
     "examples/TextExample.cpp"
-    "examples/LittlefsTest.cpp"
-    "examples/TextureTest.cpp"
     INCLUDE_DIRS 
     "include"
     "include/Shapes"

main/examples/CollisionTest.cpp

@@ -8,18 +8,19 @@
 #include "freertos/projdefs.h"
 #include "freertos/task.h"
 #include <cstdio>
+#include <memory>
 #include <stdio.h>
 
 void runCollisionTest() {
     const int width = 64;
     const int height = 64;
     Renderer renderer(width, height, Color(0, 0, 0, 1.0f));
-    Collection *mainCollection =
-        new Collection(ShapeParams{32, 32, Color(0, 0, 0, 1.0f), 0});
+    auto mainCollection = std::make_shared<Collection>(
+        ShapeParams{32, 32, Color(0, 0, 0, 1.0f), 0});
 
-    RegularPolygon *triangle = new RegularPolygon(
+    auto triangle = std::make_shared<RegularPolygon>(
         RegularPolygonRadiusParams{32, 60, Color(0, 255, 0, 1.0f), 3, 4, true});
-    Rectangle *enemy = new Rectangle(
+    auto enemy = std::make_shared<Rectangle>(
         RectangleParams{20, 0, Color(255, 0, 0, 1.0f), 10, 10, true});
     triangle->addCollider();
     enemy->addCollider();
@@ -50,7 +51,7 @@ void runCollisionTest() {
             triangle->setColor(Color(0, 255, 0, 1.0f)); // Green otherwise
         }
 
-        renderer.render(pixels, std::vector<Collection *>{mainCollection},
+        renderer.render(pixels, std::vector<std::shared_ptr<Collection>>{mainCollection},
                         options);
         display.setBuffer(pixels);
         vTaskDelay(pdMS_TO_TICKS(100));

main/examples/LittlefsTest.cpp

@@ -10,6 +10,7 @@
 #include "freertos/projdefs.h"
 #include "freertos/task.h"
 #include <cstdint>
+#include <memory>
 #include <vector>
 
 void init_input_gpio(int gpio_num) {
@@ -45,20 +46,21 @@ void runPlatformer() {
         return;
     }
 
-    Collection *mainCollection =
-        new Collection(ShapeParams{0, 0, Color(0, 0, 0, 0), 0});
+    auto mainCollection =
+        std::make_shared<Collection>(ShapeParams{0, 0, Color(0, 0, 0, 0), 0});
 
     // --- Player Setup ---
-    Rectangle *player = new Rectangle(
+    auto player = std::make_shared<Rectangle>(
         RectangleParams{10, 48, Color(255, 80, 80, 1.0f), 5, 8, true});
     player->addCollider();
     mainCollection->addShape(player);
 
     // --- Platform Setup ---
-    std::vector<Rectangle *> platforms;
+    std::vector<std::shared_ptr<Rectangle>> platforms;
 
     auto createPlatform = [&](int x, int y, int w, int h, Color c) {
-        Rectangle *p = new Rectangle(RectangleParams{x, y, c, w, h, true});
+        auto p =
+            std::make_shared<Rectangle>(RectangleParams{x, y, c, w, h, true});
         p->addCollider();
         platforms.push_back(p);
         mainCollection->addShape(p);
@@ -112,7 +114,7 @@ void runPlatformer() {
         float oldPlayerY = player->getY();
         player->translate(0.0f, velocityY);
         canJump = false;
-        for (auto *platform : platforms) {
+        for (const auto& platform : platforms) {
             if (player->intersects(platform)) {
 
                 if (velocityY > 0 &&
@@ -139,8 +141,9 @@ void runPlatformer() {
 
         // --- Rendering ---
         pixels.clear();
-        renderer.render(pixels, std::vector<Collection *>{mainCollection},
-                        options);
+        renderer.render(
+            pixels, std::vector<std::shared_ptr<Collection>>{mainCollection},
+            options);
         display.setBuffer(pixels);
 
         // --- Frame Rate Control ---
@@ -152,6 +155,4 @@ void runPlatformer() {
             vTaskDelay(pdMS_TO_TICKS(remainingTime / 1000));
         }
     }
-
-    delete mainCollection;
 }

main/examples/Platformer.cpp

@@ -18,47 +18,43 @@ void runSolarSystem() {
     const int height = 64;
     Renderer renderer(width, height, Color(0, 0, 0, 1.0f));
 
-    std::vector<Collection *> collections;
+    std::vector<std::shared_ptr<Collection>> collections;
 
-    Collection *sunCollection =
-        new Collection(ShapeParams{32, 32, Color(0, 0, 0, 1.0f), 0});
+    auto sunCollection = std::make_shared<Collection>(
+        ShapeParams{0, 0, Color(0, 0, 0, 1.0f), 0});
     sunCollection->setPivot(32.0f, 32.0f);
     collections.push_back(sunCollection);
 
-    Circle *sun =
-        new Circle(CircleParams{32, 32, Color(255, 204, 0, 1.0f), 8, true});
+    auto sun = std::make_shared<Circle>(
+        CircleParams{32, 32, Color(255, 204, 0, 1.0f), 8, true});
     sunCollection->addShape(sun);
 
-    std::vector<std::pair<int, int>> polygonVertices = {
-        {60, 60}, {63, 61}, {61, 63}};
-    Polygon *polygon = new Polygon(
-        PolygonParams{32, 32, Color(255, 150, 0, 1.0f), polygonVertices, true});
-    sunCollection->addShape(polygon);
-
-    Collection *earthCollection =
-        new Collection(ShapeParams{32, 32, Color(0, 0, 0, 1.0f), 1});
+    auto earthCollection = std::make_shared<Collection>(
+        ShapeParams{0, 0, Color(0, 0, 0, 1.0f), 1});
     earthCollection->setPivot(32.0f, 32.0f);
 
-    Circle *earth = new Circle(
+    auto earth = std::make_shared<Circle>(
         CircleParams{32 + 20, 32, Color(0, 100, 255, 1.0f), 4, true});
     earthCollection->addShape(earth);
 
-    Circle *alien = new Circle(
+    auto alien = std::make_shared<Circle>(
         CircleParams{32 - 20, 32, Color(0, 255, 100, 1.0f), 4, true});
     earthCollection->addShape(alien);
 
-    Collection *moonCollection =
-        new Collection(ShapeParams{32 + 20, 32, Color(0, 0, 0, 1.0f), 1});
-    Circle *moon = new Circle(
+    auto moonCollection = std::make_shared<Collection>(
+        ShapeParams{0, 0, Color(0, 0, 0, 1.0f), 1});
+    moonCollection->setPivot(52.0f, 32.0f);
+
+    auto moon = std::make_shared<Circle>(
         CircleParams{32 + 20 + 8, 32, Color(200, 200, 200, 1.0f), 2, true});
     moonCollection->addShape(moon);
 
     earthCollection->addShape(moonCollection);
     sunCollection->addShape(earthCollection);
 
-    Circle *earthOrbit =
-        new Circle(CircleParams{32, 32, Color(100, 100, 100, 0.3f), 20, false});
-    Circle *moonOrbit = new Circle(
+    auto earthOrbit = std::make_shared<Circle>(
+        CircleParams{32, 32, Color(100, 100, 100, 0.3f), 20, false});
+    auto moonOrbit = std::make_shared<Circle>(
         CircleParams{32 + 20, 32, Color(100, 100, 100, 0.3f), 8, false});
     sunCollection->addShape(earthOrbit);
     earthCollection->addShape(moonOrbit);
@@ -121,8 +117,4 @@ void runSolarSystem() {
             renderTime = 0;
         }
     }
-    // Cleanup
-    for (auto collection : collections) {
-        delete collection;
-    }
 }