♻️ (video): Set CGGraphics with CGColor+CGPoint+CGPixel+Character+Fil…

…ledRectangle
leka · Jan 27, 2023 · 83a6249 · 83a6249
1 parent a78c489
commit 83a6249
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 88 deletions.
diff --git a/drivers/CoreVideo/include/CGColor.hpp → drivers/CoreVideo/include/CGGraphics.hpp b/drivers/CoreVideo/include/CGColor.hpp → drivers/CoreVideo/include/CGGraphics.hpp
@@ -1,11 +1,14 @@
 // Leka - LekaOS
-// Copyright 2021 APF France handicap
+// Copyright 2023 APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
 #pragma once
 
 #include <cstdint>
 
+#include "CoreLL.h"
+#include "internal/corevideo_config.h"
+
 namespace leka {
 
 struct CGColor {
@@ -37,4 +40,36 @@ constexpr CGColor CGColor::yellow {0xFF, 0xFF, 0x00};
 constexpr CGColor CGColor::cyan {0x00, 0xFF, 0xFF};
 constexpr CGColor CGColor::magenta {0xFF, 0x00, 0xFF};
 
+struct CGPoint {
+	uint32_t x = 0;
+	uint32_t y = 0;
+};
+
+struct CGPixel {
+	explicit CGPixel(CoreLL &ll) : corell(ll) {}
+
+	CGPoint coordinates {0, 0};
+	CoreLL &corell;
+
+	void draw(CGColor color)
+	{
+		uintptr_t destination_address =
+			lcd::frame_buffer_address + (4 * (coordinates.y * lcd::dimension::width + coordinates.x));
+		uint32_t destinationColor = color.getARGB();
+
+		corell.rawMemoryWrite(destination_address, destinationColor);
+	}
+};
+
+struct Character {
+	CGPoint origin {};	 // Top left corner by convention
+	uint8_t ascii {};	 // From 0x20 to 0x7F
+};
+
+struct FilledRectangle {
+	CGPoint origin {0, 0};	 // * Top left corner by convention
+	uint16_t width {};
+	uint16_t height {};
+};
+
 }	// namespace leka
diff --git a/drivers/CoreVideo/include/CGPixel.hpp b/drivers/CoreVideo/include/CGPixel.hpp
diff --git a/drivers/CoreVideo/include/Character.hpp b/drivers/CoreVideo/include/Character.hpp
diff --git a/drivers/CoreVideo/include/CoreFont.hpp b/drivers/CoreVideo/include/CoreFont.hpp
@@ -4,9 +4,7 @@
 
 #pragma once
 
-#include "CGColor.hpp"
-#include "CGPixel.hpp"
-#include "Character.hpp"
+#include "CGGraphics.hpp"
 #include "interface/Font.hpp"
 
 namespace leka {

diff --git a/drivers/CoreVideo/include/CoreGraphics.hpp b/drivers/CoreVideo/include/CoreGraphics.hpp
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "CGColor.hpp"
+#include "CGGraphics.hpp"
 #include "CoreLL.h"
-#include "FilledRectangle.hpp"
 #include "interface/DMA2D.hpp"
 #include "interface/Graphics.hpp"
 #include "internal/corevideo_config.h"

diff --git a/drivers/CoreVideo/include/CoreVideo.hpp b/drivers/CoreVideo/include/CoreVideo.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "FilledRectangle.hpp"
+#include "CGGraphics.hpp"
 #include "interface/DMA2D.hpp"
 #include "interface/DSI.hpp"
 #include "interface/Font.hpp"

diff --git a/drivers/CoreVideo/include/FilledRectangle.hpp b/drivers/CoreVideo/include/FilledRectangle.hpp
diff --git a/drivers/CoreVideo/tests/CGColor_test.cpp b/drivers/CoreVideo/tests/CGColor_test.cpp
@@ -2,8 +2,7 @@
 // Copyright 2021 APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
-#include "CGColor.hpp"
-
+#include "CGGraphics.hpp"
 #include "gtest/gtest.h"
 
 using namespace leka;

diff --git a/drivers/CoreVideo/tests/CGPixel_test.cpp b/drivers/CoreVideo/tests/CGPixel_test.cpp
@@ -2,8 +2,7 @@
 // Copyright 2021 APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
-#include "CGPixel.hpp"
-
+#include "CGGraphics.hpp"
 #include "gtest/gtest.h"
 #include "mocks/leka/CoreLL.h"
 

diff --git a/drivers/CoreVideo/tests/CoreFont_test.cpp b/drivers/CoreVideo/tests/CoreFont_test.cpp
@@ -5,7 +5,6 @@
 #include "CoreFont.hpp"
 
 #include "CGFont.hpp"
-#include "Character.hpp"
 #include "gtest/gtest.h"
 #include "internal/corevideo_config.h"
 #include "mocks/leka/CoreLL.h"

diff --git a/drivers/CoreVideo/tests/CoreVideo_test.cpp b/drivers/CoreVideo/tests/CoreVideo_test.cpp
@@ -4,7 +4,6 @@
 
 #include "CoreVideo.hpp"
 
-#include "Character.hpp"
 #include "gtest/gtest.h"
 #include "mocks/leka/CoreDMA2D.h"
 #include "mocks/leka/CoreDSI.h"

diff --git a/libs/UIAnimationKit/include/internal/BouncingSquare.h b/libs/UIAnimationKit/include/internal/BouncingSquare.h
@@ -9,7 +9,7 @@
 #include <cstdint>
 
 #include "CGAnimation.h"
-#include "FilledRectangle.hpp"
+#include "CGGraphics.hpp"
 #include "interface/Graphics.hpp"
 
 namespace leka::animation {

diff --git a/spikes/lk_reinforcer/main.cpp b/spikes/lk_reinforcer/main.cpp
@@ -7,7 +7,7 @@
 #include "drivers/HighResClock.h"
 #include "rtos/ThisThread.h"
 
-#include "CGPixel.hpp"
+#include "CGGraphics.hpp"
 #include "CoreAccelerometer.h"
 #include "CoreDMA2D.hpp"
 #include "CoreDSI.hpp"