Improved performance, drawing functions now take pixels parameters instead of creating new vectors. Performance improved from 5.6ms to 2.6ms

JohnieWalkerCZ · JohnieWalkerCZ · commit b91e9c57c9dc · 2025-11-17T10:42:54.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 build/
 .cache/
 .github/
+dependencies.lock
diff --git a/main/include/Renderer.hpp b/main/include/Renderer.hpp
@@ -16,7 +16,7 @@ class Renderer {
     Renderer(int width, int height,
              const Color &backgroundColor = Color(255, 255, 255, 1.0f));
 
-    Pixels render(const std::vector<Collection *> &collections,
+    void render(Pixels &pixels, const std::vector<Collection *> &collections,
                   const DrawOptions &options);
 
     static Pixels blendPixels(const Pixels &pixels);
diff --git a/main/include/Shapes/Circle.hpp b/main/include/Shapes/Circle.hpp
@@ -18,8 +18,8 @@ class Circle : public Shape {
   public:
     Circle(const CircleParams &params);
     Collider *defaultCollider() override;
-    Pixels drawAntiAliased() override;
-    Pixels drawAliased() override;
+    void drawAntiAliased(Pixels &pixels) override;
+    void drawAliased(Pixels &pixels) override;
     int getRadius() const;
 
   private:
diff --git a/main/include/Shapes/Collection.hpp b/main/include/Shapes/Collection.hpp
@@ -13,6 +13,6 @@ class Collection : public Shape {
     Collider *defaultCollider() override;
     void addShape(Shape *shape);
     std::vector<Shape *> getShapes() { return shapes; }
-    Pixels drawAntiAliased() override;
-    Pixels drawAliased() override;
+    void drawAntiAliased(Pixels &pixels) override;
+    void drawAliased(Pixels &pixels) override;
 };
diff --git a/main/include/Shapes/LineSegment.hpp b/main/include/Shapes/LineSegment.hpp
@@ -18,6 +18,6 @@ class LineSegment : public Shape {
   public:
     LineSegment(const LineSegmentParams &params);
     Collider *defaultCollider() override;
-    Pixels drawAntiAliased() override;
-    Pixels drawAliased() override;
+    void drawAntiAliased(Pixels &pixels) override;
+    void drawAliased(Pixels &pixels) override;
 };
diff --git a/main/include/Shapes/Point.hpp b/main/include/Shapes/Point.hpp
@@ -5,6 +5,6 @@ class Point : public Shape {
   public:
     Point(const ShapeParams &params);
     Collider *defaultCollider() override;
-    Pixels drawAntiAliased() override;
-    Pixels drawAliased() override;
+    void drawAntiAliased(Pixels &pixels) override;
+    void drawAliased(Pixels &pixels) override;
 };
diff --git a/main/include/Shapes/Polygon.hpp b/main/include/Shapes/Polygon.hpp
@@ -21,13 +21,14 @@ class Polygon : public Shape {
   public:
     Polygon(const PolygonParams &params);
     Collider *defaultCollider() override;
-    Pixels drawAntiAliased() override;
-    Pixels drawAliased() override;
+    void drawAntiAliased(Pixels &pixels) override;
+    void drawAliased(Pixels &pixels) override;
 
   private:
     std::vector<std::pair<int, int>> getTransformedVertices();
     std::vector<LineSegment *> getSegments();
-    Pixels getInsidePoints(const std::vector<std::pair<int, int>> &vertices);
-    Pixels getInsidePointsWithTexture(
-        const std::vector<std::pair<int, int>> &vertices);
+    void getInsidePoints(Pixels &points,
+                         const std::vector<std::pair<int, int>> &vertices);
+    void getInsidePointsWithTexture(
+        Pixels &points, const std::vector<std::pair<int, int>> &vertices);
 };
diff --git a/main/include/Shapes/Rectangle.hpp b/main/include/Shapes/Rectangle.hpp
@@ -21,10 +21,11 @@ class Rectangle : public Shape {
   public:
     Rectangle(const RectangleParams &params);
     Collider *defaultCollider() override;
-    Pixels drawAntiAliased() override;
-    Pixels drawAliased() override;
+    void drawAntiAliased(Pixels &pixels) override;
+    void drawAliased(Pixels &pixels) override;
 
   private:
     std::vector<std::pair<int, int>> getVertices();
-    Pixels getInsidePoints(const std::vector<std::pair<int, int>> &vertices);
+    void getInsidePoints(Pixels &points,
+                         const std::vector<std::pair<int, int>> &vertices);
 };
diff --git a/main/include/Shapes/RegularPolygon.hpp b/main/include/Shapes/RegularPolygon.hpp
@@ -36,17 +36,18 @@ class RegularPolygon : public Shape {
     RegularPolygon(const RegularPolygonSideParams &params);
     RegularPolygon(const RegularPolygonRadiusParams &params);
     Collider *defaultCollider() override;
-    Pixels drawAntiAliased() override;
-    Pixels drawAliased() override;
+    void drawAntiAliased(Pixels &pixels) override;
+    void drawAliased(Pixels &pixels) override;
     int getSides() const;
     int getRadius();
 
   private:
     int calculateRadiusFromSideLength(int sideLength);
     std::vector<std::pair<int, int>> getVertices();
     std::vector<LineSegment *> getSegments();
-    Pixels getInsidePoints(const std::vector<std::pair<int, int>> &vertices);
+    void getInsidePoints(Pixels &points,
+                         const std::vector<std::pair<int, int>> &vertices);
 
-    Pixels getInsidePointsWithTexture(
-        const std::vector<std::pair<int, int>> &vertices);
+    void getInsidePointsWithTexture(
+        Pixels &points, const std::vector<std::pair<int, int>> &vertices);
 };
diff --git a/main/include/Shapes/Shape.hpp b/main/include/Shapes/Shape.hpp
@@ -82,8 +82,8 @@ class Shape {
   protected:
     std::pair<int, int> getTransformedPosition(int x, int y);
 
-    Pixels bresenhamLine(int x0, int y0, int x1, int y1);
-    Pixels wuLine(int x0, int y0, int x1, int y1);
+    void bresenhamLine(Pixels &points, int x0, int y0, int x1, int y1);
+    void wuLine(Pixels &points, int x0, int y0, int x1, int y1);
     void addPixel(Pixels &points, int x, int y, float alpha);
 
   public:
@@ -98,10 +98,11 @@ class Shape {
     void rotate(float angle);
     void setPivot(int x, int y);
 
-    Pixels draw(const DrawOptions &options);
-    virtual Pixels drawAntiAliased() = 0;
-    virtual Pixels drawAliased() = 0;
+    void draw(Pixels &pixels, const DrawOptions &options);
+    virtual void drawAntiAliased(Pixels &pixels) = 0;
+    virtual void drawAliased(Pixels &pixels) = 0;
 
   protected:
-    Pixels getInsidePoints(const std::vector<std::pair<int, int>> &vertices);
+    void getInsidePoints(Pixels &points,
+                         const std::vector<std::pair<int, int>> &vertices);
 };
diff --git a/main/main.cpp b/main/main.cpp
@@ -1,4 +1,3 @@
-#include "Joystick.hpp"
 #include "LineSegment.hpp"
 #include "Point.hpp"
 #include "Polygon.hpp"
@@ -9,7 +8,6 @@
 #include "Shapes/Collection.hpp"
 #include "Shapes/Rectangle.hpp"
 #include "Utils.hpp"
-#include "driver/adc.h"
 #include "esp_log.h"
 #include "esp_timer.h"
 #include "freertos/idf_additions.h"
@@ -90,7 +88,8 @@ void runSolarSystem() {
         earthCollection->rotate(1.5f);
         moonCollection->rotate(3.0f);
 
-        Pixels pixels = renderer.render(collections, options);
+        Pixels pixels;
+        renderer.render(pixels, collections, options);
         display.setBuffer(pixels);
 
         uint64_t frameEndTime = esp_timer_get_time();
@@ -185,8 +184,9 @@ void runTestShapes() {
         return;
     }
 
-    Pixels pixels = PROFILE_FUNC_RET(
-        renderer.render(std::vector<Collection *>{mainCollection}, options));
+    Pixels pixels;
+    PROFILE_FUNC(renderer.render(
+        pixels, std::vector<Collection *>{mainCollection}, options));
     profile_print_results();
     while (true) {
         display.setBuffer(pixels);
@@ -243,60 +243,13 @@ void runCollisionTest() {
         // Apply gravity for next frame
         velocityY += gravity;
 
-        Pixels pixels =
-            renderer.render(std::vector<Collection *>{mainCollection}, options);
+        Pixels pixels;
+        renderer.render(pixels, std::vector<Collection *>{mainCollection},
+                        options);
         display.setBuffer(pixels);
         vTaskDelay(1);
     }
 }
-Joystick joystick(ADC_UNIT_2, ADC_CHANNEL_3, ADC_CHANNEL_4);
-void runJoystickTest() {
-    int x_adc = 0;
-    int y_adc = 0;
-
-    if (!joystick.begin()) {
-        ESP_LOGE("MAIN", "Failed to initialize joystick");
-        return;
-    }
-
-    // Optional: Force recalibration (uncomment if needed)
-    // joystick.calibrate(5000); // 5-second calibration
-
-    // Optional: Configure settings
-    joystick.setDeadzone(15);    // 15% deadzone
-    joystick.setSampleCount(50); // 50 samples per reading
-
-    while (1) {
-        // Get calibrated position
-        Joystick::Position pos = joystick.getPosition();
-
-        // Get raw values for debugging
-        Joystick::Position raw = joystick.getRawPosition();
-
-        // Print results
-        ESP_LOGI("MAIN", "Calibrated: X=%3d%%, Y=%3d%% | Raw: X=%4d, Y=%4d",
-                 pos.x, pos.y, raw.x, raw.y);
-
-        // Use utility methods
-        if (joystick.isCentered()) {
-            ESP_LOGI("MAIN", "CENTERED");
-        }
-        if (joystick.isLeft()) {
-            ESP_LOGI("MAIN", "LEFT");
-        }
-        if (joystick.isRight()) {
-            ESP_LOGI("MAIN", "RIGHT");
-        }
-        if (joystick.isUp()) {
-            ESP_LOGI("MAIN", "UP");
-        }
-        if (joystick.isDown()) {
-            ESP_LOGI("MAIN", "DOWN");
-        }
-
-        vTaskDelay(pdMS_TO_TICKS(200));
-    }
-}
 
 extern "C" int app_main(void) {
     runTestShapes();
diff --git a/main/src/Renderer.cpp b/main/src/Renderer.cpp
@@ -4,20 +4,16 @@
 Renderer::Renderer(int width, int height, const Color &backgroundColor)
     : width(width), height(height), backgroundColor(backgroundColor) {}
 
-Pixels Renderer::render(const std::vector<Collection *> &collections,
+void Renderer::render(Pixels &pixels,
+                        const std::vector<Collection *> &collections,
                         const DrawOptions &options) {
-    Pixels pixels;
-
+    pixels.reserve(10000);
     std::vector<Collection *> sortedCollections = collections;
     std::sort(
         sortedCollections.begin(), sortedCollections.end(),
         [](Collection *a, Collection *b) { return a->getZ() < b->getZ(); });
 
     for (Collection *collection : sortedCollections) {
-        Pixels collectionPixels = PROFILE_FUNC_RET(collection->draw(options));
-        pixels.insert(pixels.end(), collectionPixels.begin(),
-                      collectionPixels.end());
+        PROFILE_FUNC(collection->draw(pixels, options));
     }
-
-    return pixels;
 }
diff --git a/main/src/Shapes/Circle.cpp b/main/src/Shapes/Circle.cpp
@@ -107,8 +107,7 @@ void Circle::fillCircleAntiAliased(Pixels &points, int cx, int cy, int r) {
     }
 }
 
-Pixels Circle::drawAliased() {
-    Pixels points;
+void Circle::drawAliased(Pixels &pixels) {
     auto center = getTransformedPosition(x, y);
     int r = radius;
 
@@ -117,7 +116,7 @@ Pixels Circle::drawAliased() {
     int d = 1 - r;
 
     while (xPos <= yPos) {
-        drawCirclePoints(points, center.first, center.second, xPos, yPos);
+        drawCirclePoints(pixels, center.first, center.second, xPos, yPos);
 
         if (d < 0) {
             d = d + 2 * xPos + 3;
@@ -129,15 +128,12 @@ Pixels Circle::drawAliased() {
     }
 
     if (fill) {
-        fillCircle(points, center.first, center.second, r);
+        fillCircle(pixels, center.first, center.second, r);
     }
-
-    return points;
 }
 
-Pixels Circle::drawAntiAliased() {
+void Circle::drawAntiAliased(Pixels &pixels) {
     PROFILE_START();
-    Pixels points;
     auto center = getTransformedPosition(x, y);
     int r = radius;
 
@@ -155,19 +151,18 @@ Pixels Circle::drawAntiAliased() {
         float y1 = std::floor(yPos);
         float y2 = y1 + 1;
 
-        drawAntiAliasedPoint(points, center.first, center.second, xPos, y1,
+        drawAntiAliasedPoint(pixels, center.first, center.second, xPos, y1,
                              intensity2);
-        drawAntiAliasedPoint(points, center.first, center.second, xPos, y2,
+        drawAntiAliasedPoint(pixels, center.first, center.second, xPos, y2,
                              intensity);
-        drawAntiAliasedPoint(points, center.first, center.second, y1, xPos,
+        drawAntiAliasedPoint(pixels, center.first, center.second, y1, xPos,
                              intensity2);
-        drawAntiAliasedPoint(points, center.first, center.second, y2, xPos,
+        drawAntiAliasedPoint(pixels, center.first, center.second, y2, xPos,
                              intensity);
     }
 
     if (fill) {
-        fillCircleAntiAliased(points, center.first, center.second, r);
+        fillCircleAntiAliased(pixels, center.first, center.second, r);
     }
     PROFILE_END("Circle::drawAntiAliased");
-    return points;
 }
diff --git a/main/src/Shapes/Collection.cpp b/main/src/Shapes/Collection.cpp
@@ -27,31 +27,22 @@ void Collection::addShape(Shape *shape) {
     shapes.push_back(shape);
 }
 
-Pixels Collection::drawAntiAliased() {
-    Pixels pixels;
-
+void Collection::drawAntiAliased(Pixels &pixels) {
     std::vector<Shape *> sortedShapes = shapes;
     simple_sort(sortedShapes,
                 [](Shape *a, Shape *b) { return a->getZ() < b->getZ(); });
 
     for (Shape *shape : sortedShapes) {
-        Pixels shapePixels = PROFILE_FUNC_RET(shape->drawAntiAliased());
-        pixels.insert(pixels.end(), shapePixels.begin(), shapePixels.end());
+        PROFILE_FUNC(shape->drawAntiAliased(pixels));
     }
-
-    return pixels;
 }
 
-Pixels Collection::drawAliased() {
-    Pixels pixels;
-
+void Collection::drawAliased(Pixels &pixels) {
     std::vector<Shape *> sortedShapes = shapes;
     simple_sort(sortedShapes,
                 [](Shape *a, Shape *b) { return a->getZ() < b->getZ(); });
 
     for (Shape *shape : sortedShapes) {
-        Pixels shapePixels = shape->drawAliased();
-        pixels.insert(pixels.end(), shapePixels.begin(), shapePixels.end());
+        shape->drawAliased(pixels);
     }
-    return pixels;
 }
diff --git a/main/src/Shapes/LineSegment.cpp b/main/src/Shapes/LineSegment.cpp
@@ -9,27 +9,24 @@ Collider *LineSegment::defaultCollider() {
     return new LineSegmentCollider(x, y, x2, y2);
 }
 
-Pixels LineSegment::drawAliased() {
+void LineSegment::drawAliased(Pixels &pixels) {
     auto transformedStart = getTransformedPosition(x, y);
     auto transformedEnd = getTransformedPosition(x2, y2);
     int x0 = transformedStart.first;
     int y0 = transformedStart.second;
     int x1 = transformedEnd.first;
     int y1 = transformedEnd.second;
 
-    return bresenhamLine(x0, y0, x1, y1);
+    bresenhamLine(pixels, x0, y0, x1, y1);
 }
 
-Pixels LineSegment::drawAntiAliased() {
+void LineSegment::drawAntiAliased(Pixels &pixels) {
     auto transformedStart = getTransformedPosition(x, y);
     auto transformedEnd = getTransformedPosition(x2, y2);
     int x0 = transformedStart.first;
     int y0 = transformedStart.second;
     int x1 = transformedEnd.first;
     int y1 = transformedEnd.second;
 
-    Pixels points;
-    points = wuLine(x0, y0, x1, y1);
-
-    return points;
+    wuLine(pixels, x0, y0, x1, y1);
 }
diff --git a/main/src/Shapes/Point.cpp b/main/src/Shapes/Point.cpp
diff --git a/main/src/Shapes/Polygon.cpp b/main/src/Shapes/Polygon.cpp
diff --git a/main/src/Shapes/Rectangle.cpp b/main/src/Shapes/Rectangle.cpp
diff --git a/main/src/Shapes/RegularPolygon.cpp b/main/src/Shapes/RegularPolygon.cpp
diff --git a/main/src/Shapes/Shape.cpp b/main/src/Shapes/Shape.cpp

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 build/
 .cache/
 .github/
 +dependencies.lock