refactor: Organize Shape class methods

Reorganize the methods in the Shape class (Shape.hpp and Shape.cpp) by
categorizing them with comments and grouping related functionalities.
This improves code readability and maintainability.

Author: JohnieWalkerCZ

main/include/Shapes/Shape.hpp

@@ -66,115 +66,127 @@ class Shape {
 
     Collider *collider;
 
+    // Protected helper methods
+    std::pair<int, int> getTransformedPosition(int x, int y);
+    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);
+    void getInsidePoints(Pixels &points,
+                         const std::vector<std::pair<int, int>> &vertices);
+
   public:
     Shape(const ShapeParams &params);
     virtual ~Shape();
 
-    void addCollider(Collider *collider = nullptr);
-    Collider *getCollider() const { return collider; }
+    // Pure virtual methods
+    virtual void drawAntiAliased(Pixels &pixels) = 0;
+    virtual void drawAliased(Pixels &pixels) = 0;
     virtual Collider *defaultCollider() = 0;
-    void removeCollider();
-    bool intersects(Shape *other);
+
+    // Drawing
+    void draw(Pixels &pixels, const DrawOptions &options);
+
+    // Position and transformation methods
+    void setPosition(int x, int y);
     void translate(int dx, int dy);
     void translate(float dx, float dy);
+    void rotate(float angle);
+    void setPivot(int x, int y);
+
+    void setScale(float scaleX, float scaleY, float originX = -1,
+                  float originY = -1);
+    void scaleX(float scaleX, float originX = -1);
+    void scaleY(float scaleY, float originY = -1);
+    void setScaleOrigin(int x, int y);
 
+    // Collider methods
+    void addCollider(Collider *collider = nullptr);
+    void removeCollider();
+    bool intersects(Shape *other);
+
+    // Texture methods
     void setTexture(Texture *texture);
-    Texture *getTexture() const { return texture; }
     void setTextureScale(float scaleX, float scaleY);
     void setTextureOffset(float offsetX, float offsetY);
-    void setFixTexture(bool fixed);
-    bool getFixTexture() const { return fixTexture; }
     void setTextureRotation(float rotation);
+    void setFixTexture(bool fixed);
     Color sampleTexture(int x, int y);
 
-    float getUVScaleX() const { return uvTransform.scaleX; }
-    float getUVScaleY() const { return uvTransform.scaleY; }
-    float getUVOffsetX() const { return uvTransform.offsetX; }
-    float getUVOffsetY() const { return uvTransform.offsetY; }
-    float getUVRotation() const { return uvTransform.rotation; }
-
-    void setUVScaleX(float scaleX) {
-        this->uvTransform.scaleX = scaleX;
-        this->uvTransform.invScaleX = 1.0f / scaleX;
-    }
-    void setUVScaleY(float scaleY) {
-        this->uvTransform.scaleY = scaleY;
-        this->uvTransform.invScaleY = 1.0f / scaleY;
-    }
-    void setUVOffsetX(float offsetX) { this->uvTransform.offsetX = offsetX; }
-    void setUVOffsetY(float offsetY) { this->uvTransform.offsetY = offsetY; }
-    void setUVRotation(float rotation) {
-        this->uvTransform.rotation = rotation;
-        invalidateTexTrigCache();
-    }
-
+    // Parent-child relationship
     void setParent(Shape *parent);
-    Shape *getParent() const { return parent; }
 
+    // Cache invalidation
     void invalidateTrigCache() { trigCacheValid = false; }
     void invalidateTexTrigCache() { texTrigCacheValid = false; }
 
+    // Getters
     float getX() const { return x; }
     float getY() const { return y; }
     int getZ() const { return z; }
     const Color &getColor() const { return color; }
 
+    float getRotationAngle() const { return rotation.angle; }
+    int getRotationX() const { return rotation.x; }
+    int getRotationY() const { return rotation.y; }
+
+    float getScaleX() const { return scale.x; }
+    float getScaleY() const { return scale.y; }
+    int getScaleOriginX() const { return scale.originX; }
+    int getScaleOriginY() const { return scale.originY; }
+
+    Texture *getTexture() const { return texture; }
+    bool getFixTexture() const { return fixTexture; }
+
+    float getUVScaleX() const { return uvTransform.scaleX; }
+    float getUVScaleY() const { return uvTransform.scaleY; }
+    float getUVOffsetX() const { return uvTransform.offsetX; }
+    float getUVOffsetY() const { return uvTransform.offsetY; }
+    float getUVRotation() const { return uvTransform.rotation; }
+
+    Collider *getCollider() const { return collider; }
+    Shape *getParent() const { return parent; }
+
+    // Setters
     void setX(int x) {
         this->x = x;
         if (collider) {
             collider->setX(x);
         }
     }
+
     void setY(int y) {
         this->y = y;
         if (collider) {
             collider->setY(y);
         }
     }
-    void setColor(const Color &color) { this->color = color; }
-
-  protected:
-    std::pair<int, int> getTransformedPosition(int x, int y);
 
-    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:
-    void setScale(float scaleX, float scaleY, float originX = -1,
-                  float originY = -1);
-    void scaleX(float scaleX, float originX = -1);
-    void scaleY(float scaleY, float originY = -1);
-    void setScaleOrigin(int x, int y);
+    void setColor(const Color &color) { this->color = color; }
+    void setZ(int z);
 
-    float getScaleX() const { return scale.x; }
-    float getScaleY() const { return scale.y; }
-    int getScaleOriginX() const { return scale.originX; }
-    int getScaleOriginY() const { return scale.originY; }
+    void setRotationAngle(float angle) { this->rotation.angle = angle; }
+    void setRotationX(int x) { this->rotation.x = x; }
+    void setRotationY(int y) { this->rotation.y = y; }
 
     void setScaleX(float scaleX) { this->scale.x = scaleX; }
     void setScaleY(float scaleY) { this->scale.y = scaleY; }
     void setScaleOriginX(int x) { this->scale.originX = x; }
     void setScaleOriginY(int y) { this->scale.originY = y; }
-    void changeColor(const Color &color);
-    void setZ(int z);
-    void setPosition(int x, int y);
-    void rotate(float angle);
-    void setPivot(int x, int y);
-
-    float getRotationAngle() const { return rotation.angle; }
-    int getRotationX() const { return rotation.x; }
-    int getRotationY() const { return rotation.y; }
 
-    void setRotationAngle(float angle) { this->rotation.angle = angle; }
-    void setRotationX(int x) { this->rotation.x = x; }
-    void setRotationY(int y) { this->rotation.y = y; }
+    void setUVScaleX(float scaleX) {
+        this->uvTransform.scaleX = scaleX;
+        this->uvTransform.invScaleX = 1.0f / scaleX;
+    }
 
-    void draw(Pixels &pixels, const DrawOptions &options);
-    virtual void drawAntiAliased(Pixels &pixels) = 0;
-    virtual void drawAliased(Pixels &pixels) = 0;
+    void setUVScaleY(float scaleY) {
+        this->uvTransform.scaleY = scaleY;
+        this->uvTransform.invScaleY = 1.0f / scaleY;
+    }
 
-  protected:
-    void getInsidePoints(Pixels &points,
-                         const std::vector<std::pair<int, int>> &vertices);
+    void setUVOffsetX(float offsetX) { this->uvTransform.offsetX = offsetX; }
+    void setUVOffsetY(float offsetY) { this->uvTransform.offsetY = offsetY; }
+    void setUVRotation(float rotation) {
+        this->uvTransform.rotation = rotation;
+        invalidateTexTrigCache();
+    }
 };