Add files via upload

Bexin3 · May 21, 2024 · f0dea5a · f0dea5a
1 parent 0aa8c2c
commit f0dea5a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 22 deletions.
diff --git a/src/SpeeduinoGL.cpp b/src/SpeeduinoGL.cpp
@@ -8,6 +8,7 @@ uint32_t ResH = 800;
 uint16_t InputSizeH = 240;
 uint16_t InputSizeV = 320;
 uint32_t CameraAddress = 1613300736;
+bool grayscale = 0;
 
 
   void ConfigBuffer(uint32_t Address, uint32_t ResolutionV, uint32_t ResolutionH) {
@@ -16,10 +17,11 @@ uint32_t CameraAddress = 1613300736;
     ResH = ResolutionH;
   }
 
-void ConfigInput(uint32_t Address, uint32_t ResolutionV, uint32_t ResolutionH ) {
+void ConfigInput(uint32_t Address, uint32_t ResolutionV, uint32_t ResolutionH, bool Grayscale) {
    InputSizeV = ResolutionV;
    CameraAddress = Address;
    InputSizeH = ResolutionH;
+   grayscale = Grayscale;
 }
 
 void FillScreen(uint16_t Colour) {
@@ -252,7 +254,9 @@ DoubleFloat TwoLineRasterizer(int32_t CellStartX, int32_t CellEndX, float Pointe
 
 void TransferSquares(float ShiftH, float ShiftV, float zoom, float rotationRad) {
 
+
       uint16_t* InputBuffer = (uint16_t*)CameraAddress;
+      uint8_t* InputBufferGray = (uint8_t*)CameraAddress;
 
       float gradient1 = cos(rotationRad);
       float gradient2 = sin(rotationRad);
@@ -316,24 +320,35 @@ void TransferSquares(float ShiftH, float ShiftV, float zoom, float rotationRad)
 
         for (int16_t PosV = 0; PosV < InputSizeV; PosV++) {
 
-          if (CellPointerH <= BoundEndH && CellPointerV <= BoundEndV && CellPointerH >= BoundStartH && CellPointerV >= BoundStartV) {
-
-              BoundaryPassed = 1;
-              RowsPassed = 1;
-
-
-            Rectangle square = {
-              { CellPointerH, CellPointerV },
-              { CellPointerHU, CellPointerVU },
-              { CellPointerH2, CellPointerV2 },
-              { CellPointerHU2, CellPointerVU2 }
-            };
-
-
-
+            if (CellPointerH <= BoundEndH && CellPointerV <= BoundEndV && CellPointerH >= BoundStartH && CellPointerV >= BoundStartV) {
+
+                BoundaryPassed = 1;
+                RowsPassed = 1;
+
+
+                Rectangle square = {
+                    { CellPointerH, CellPointerV },
+                    { CellPointerHU, CellPointerVU },
+                    { CellPointerH2, CellPointerV2 },
+                    { CellPointerHU2, CellPointerVU2 }
+                };
+
+
+
+                uint16_t Colour;
+                if (grayscale) {
+                    Colour = InputBufferGray[InputSizeV * PosH + PosV];
+
+                        uint16_t red = (Colour >> 3) & 0x1F;
+                        uint16_t green = (Colour >> 2) & 0x3F;
+                        uint16_t blue = (Colour >> 3) & 0x1F;
+                        Colour = (red << 11) | (green << 5) | blue;
 
-            uint16_t Colour = InputBuffer[InputSizeV * PosH + PosV];
-            Colour = (((Colour >> 8) & 0x00FF) | ((Colour << 8) & 0xFF00));
+
+                } else {
+                    Colour = InputBuffer[InputSizeV * PosH + PosV];
+                    Colour = (((Colour >> 8) & 0x00FF) | ((Colour << 8) & 0xFF00));
+                };
 
 
 
@@ -415,13 +430,12 @@ void TransferSquares(float ShiftH, float ShiftV, float zoom, float rotationRad)
 
 
 void RectangleReplacement(RectangleRasterData Past, RectangleRasterData New, uint16_t Colour) {
-
+//you might see !(Past.RectangleBottomX <= 0), yes its weird but it seems for some reason > for two signed numbers is currently broken for Giga R1 and causes issues when one number is negative.
 
     uint16_t* ImageBuffer = (uint16_t*)ImageAddress;
 
 
 
-
     if (Past.RectangleStartX < 0) {
         if (Past.RectangleEndX < 0) {
             goto returnpoint;
@@ -462,7 +476,6 @@ void RectangleReplacement(RectangleRasterData Past, RectangleRasterData New, uin
     };
 
 
-
     if (New.RectangleStartX < Past.RectangleStartX) {
         New.RectangleStartX = Past.RectangleStartX;
     };

diff --git a/src/SpeeduinoGL.h b/src/SpeeduinoGL.h
@@ -43,7 +43,7 @@ struct RectangleRasterData {
 
 
   void ConfigBuffer(uint32_t address = 0x60000000, uint32_t ResolutionV = 480, uint32_t ResolutionH = 800);
-  void ConfigInput(uint32_t address = 1613300736, uint32_t ResolutionV = 320, uint32_t ResolutionH = 240);
+  void ConfigInput(uint32_t address = 1613300736, uint32_t ResolutionV = 320, uint32_t ResolutionH = 240, bool Grayscale = 0);
   void FillTriangle(Triangle triangle, uint16_t Colour);
   void FillRectangle(Rectangle rectangle, uint16_t Colour);