From 10c8a1fbf78bfa1470551677796be1b02a4dc017 Mon Sep 17 00:00:00 2001
From: Simon Hardt <s-hardt@live.de>
Date: Fri, 4 Mar 2022 00:14:27 +0100
Subject: [PATCH] add: Rect

---
 frame/src/main.cpp                | 13 +++++++
 frame/src/render/RenderTarget.cpp | 64 ++++++++++++++++++++++---------
 frame/src/render/RenderTarget.hpp |  9 ++++-
 3 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/frame/src/main.cpp b/frame/src/main.cpp
index 1951251..d00d7ea 100644
--- a/frame/src/main.cpp
+++ b/frame/src/main.cpp
@@ -43,6 +43,19 @@ int main()
     target.DrawCircle(center, 210);
     target.DrawCircle(center, 220);
 
+    target.DrawCircle(center, 230);
+    target.DrawCircle(center, 231);
+
+    target.DrawRectFilled({100, 100}, {202, 202});
+    target.DrawCircle({151, 151}, 50, frame::WHITE);
+    target.DrawCircle({151, 151}, 40, frame::WHITE);
+    target.DrawCircle({151, 151}, 30, frame::WHITE);
+    target.DrawCircle({151, 151}, 20, frame::WHITE);
+    target.DrawCircle({151, 151}, 10, frame::WHITE);
+    target.DrawCircle({151, 151},  1, frame::WHITE);
+
+    target.DrawRect({10, (int)display.getSize().height - 110}, {110, (int)display.getSize().height - 10}, 5);
+
     display.Display(target.getImage());
 
     std::this_thread::sleep_for(10s);
diff --git a/frame/src/render/RenderTarget.cpp b/frame/src/render/RenderTarget.cpp
index a368c45..8680a82 100644
--- a/frame/src/render/RenderTarget.cpp
+++ b/frame/src/render/RenderTarget.cpp
@@ -81,15 +81,7 @@ namespace frame::render
         int32_t const r_2 = radius * radius;
         Vector pos{0, -radius};
 
-        DrawPixel(center + pos, color);
-        DrawPixel(center + Vector{pos.x, pos.y * -1}, color);
-        DrawPixel(center + Vector{pos.x * -1, pos.y * -1}, color);
-        DrawPixel(center + Vector{pos.x * -1, pos.y}, color);
-
-        DrawPixel(center + Vector{pos.y, pos.x}, color);
-        DrawPixel(center + Vector{pos.y, pos.x * -1}, color);
-        DrawPixel(center + Vector{pos.y * -1, pos.x * -1}, color);
-        DrawPixel(center + Vector{pos.y * -1, pos.x}, color);
+        DrawPointsMirrorCircle(center, pos, color);
 
         while(pos.x <= radius / std::sqrt(2.f))
         {
@@ -108,16 +100,52 @@ namespace frame::render
                 E += 2 * pos.x - 2 * pos.y + 5;
             }
 
-            DrawPixel(center + pos, color);
-            DrawPixel(center + Vector{pos.x, pos.y * -1}, color);
-            DrawPixel(center + Vector{pos.x * -1, pos.y * -1}, color);
-            DrawPixel(center + Vector{pos.x * -1, pos.y}, color);
-
-            DrawPixel(center + Vector{pos.y, pos.x}, color);
-            DrawPixel(center + Vector{pos.y, pos.x * -1}, color);
-            DrawPixel(center + Vector{pos.y * -1, pos.x * -1}, color);
-            DrawPixel(center + Vector{pos.y * -1, pos.x}, color);
+            DrawPointsMirrorCircle(center, pos, color);
         }
     }
 
+    void RenderTarget::DrawRectFilled(Vector const& LeftTop, Vector const& BottomRight, Color color)
+    {
+         auto pos = LeftTop;
+
+         while(pos.y <= BottomRight.y)
+         {
+             while(pos.x <= BottomRight.x)
+             {
+                 DrawPixel(pos, color);
+                 pos.x++;
+             }
+             pos.x = LeftTop.x;
+             pos.y++;
+         }
+    }
+
+    void RenderTarget::DrawRect(Vector const& TopLeft, Vector const& BottomRight, uint8_t LineWidth, Color color)
+    {
+        auto pos = TopLeft;
+
+        auto const lw = LineWidth - 1;
+
+        DrawRectFilled(TopLeft, {BottomRight.x, TopLeft.y + lw}, color);
+        DrawRectFilled({TopLeft.x, BottomRight.y - lw}, BottomRight);
+
+        DrawRectFilled({TopLeft.x         , TopLeft.y     + lw},
+                       {TopLeft.x     + lw, BottomRight.y - lw});
+        DrawRectFilled({BottomRight.x - lw, TopLeft.y     + lw},
+                       {BottomRight.x     , BottomRight.y - lw});
+    }
+
+    void RenderTarget::DrawPointsMirrorCircle(Vector const& center, Vector const& pos, Color color)
+    {
+        DrawPixel(center + pos, color);
+        DrawPixel(center + Vector{pos.x, pos.y * -1}, color);
+        DrawPixel(center + Vector{pos.x * -1, pos.y * -1}, color);
+        DrawPixel(center + Vector{pos.x * -1, pos.y}, color);
+
+        DrawPixel(center + Vector{pos.y, pos.x}, color);
+        DrawPixel(center + Vector{pos.y, pos.x * -1}, color);
+        DrawPixel(center + Vector{pos.y * -1, pos.x * -1}, color);
+        DrawPixel(center + Vector{pos.y * -1, pos.x}, color);
+    }
+
 } // namespace frame::render
diff --git a/frame/src/render/RenderTarget.hpp b/frame/src/render/RenderTarget.hpp
index 1ed53d5..5a47dad 100644
--- a/frame/src/render/RenderTarget.hpp
+++ b/frame/src/render/RenderTarget.hpp
@@ -24,10 +24,17 @@ namespace frame::render
                         int32_t radius,
                         Color color = BLACK);
 
+        void DrawRectFilled(Vector const& TopLeft, Vector const& BottomRight, Color color = BLACK);
+
+        void DrawRect(Vector const& TopLeft, Vector const& BottomRight, uint8_t LineWidth, Color color = BLACK);
+
         Image const& getImage()
         {
             return image;
         }
+    private:
+        void DrawPointsMirrorCircle(Vector const& center, Vector const& pos, Color color);
+
     };
 
-} // namespace frame::render
\ No newline at end of file
+} // namespace frame::render