From d2c76354e20f3b3db9d6ac245a129fd856b2f767 Mon Sep 17 00:00:00 2001
From: Annika <annika@annikadev.com>
Date: Sun, 5 Jul 2026 07:48:33 -0700
Subject: [PATCH] added some checks for trapezoid ordering

---
 test     | Bin 41176 -> 41176 bytes
 test.cpp |  63 ++++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/test b/test
index 2d09d8cde5e5d343fb8b1be31596a04c0c03b025..eb536b97974dd53381f9b91f6bdc6b6d48c02df8 100755
GIT binary patch
delta 4470
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
T*VnQl`<5&F`h3Q=y<z_aNA6!u

delta 4431
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
PaCf<;=JuIdUk&{q4q;sF

diff --git a/test.cpp b/test.cpp
index f3e4484..6d5fd7c 100644
--- a/test.cpp
+++ b/test.cpp
@@ -205,6 +205,24 @@ namespace UwU {
         }
         return;
       }
+
+      // Draw a horizontally bounded trapezoid
+      // coords.y1 >= coords.y0
+      void pTrapezoid (Trapezoid coords, Color color) {
+        uint16_t height = 1 + coords.y1 - coords.y0;
+        int16_t LeftBound[height];
+        int16_t RightBound[height];
+  
+        this->bresenham(coords.xl0, coords.y1 - coords.y0, coords.xl1, LeftBound);
+        this->bresenham(coords.xr0, coords.y1 - coords.y0, coords.xr1, RightBound);
+  
+        for (uint16_t i = 0; i <= height; i++) {
+          for (uint16_t x = LeftBound[i]; x <= RightBound[i]; x++) {
+            this->putPixel((uint32_t)x, (uint32_t)i + coords.y0, color.r, color.g, color.b, color.a);
+          }
+        }
+        return;
+      }
     
     public:
       struct waymini* wm;
@@ -325,22 +343,37 @@ namespace UwU {
         }
       }
 
-      // Draw a horizontally bounded trapezoid
-      // coords.y1 >= coords.y0
+      // Draws a horizontally bounded trapezoid
       void trapezoid (Trapezoid coords, Color color) {
-        uint16_t height = 1 + coords.y1 - coords.y0;
-        int16_t LeftBound[height];
-        int16_t RightBound[height];
-
-        this->bresenham(coords.xl0, coords.y1 - coords.y0, coords.xl1, LeftBound);
-        this->bresenham(coords.xr0, coords.y1 - coords.y0, coords.xr1, RightBound);
-
-        for (uint16_t i = 0; i <= height; i++) {
-          for (uint16_t x = LeftBound[i]; x <= RightBound[i]; x++) {
-            this->putPixel((uint32_t)x, (uint32_t)i + coords.y0, color.r, color.g, color.b, color.a);
-          }
+        UwU::Trapezoid saneCoords = coords;
+        if (coords.y0 > coords.y1) {
+          saneCoords.y0 = coords.y1;
+          saneCoords.y1 = coords.y0;
+          saneCoords.xl0 = coords.xl1;
+          saneCoords.xl1 = coords.xl0;
+          saneCoords.xr0 = coords.xr1;
+          saneCoords.xr1 = coords.xr0;
         }
-        return;
+        uint16_t tempVal;
+        bool hflip0 = false;
+        if (saneCoords.xl0 > saneCoords.xr0) {
+          tempVal = saneCoords.xl0;
+          saneCoords.xl0 = saneCoords.xr0;
+          saneCoords.xr0 = tempVal;
+          hflip0 = true;
+        }
+        if (saneCoords.xl1 > saneCoords.xr1) {
+          if (!hflip0) {
+            // invalid geometry; emit console warning and don't attempt to draw
+            // possible options are: don't draw, lazy draw (incorrect geometry) -
+            // or split into two (way more work)
+            return;
+          }
+          tempVal = saneCoords.xl1;
+          saneCoords.xl1 = saneCoords.xr1;
+          saneCoords.xr1 = tempVal;
+        }
+        this->pTrapezoid(saneCoords, color);
       }
     };
   }
@@ -363,7 +396,7 @@ int main(void) {
   draw.rectangle(UwU::Coord2(69, 69), UwU::Coord2(420, 420), fuchsia);
   draw.rectangleGradient(UwU::Coord2(200, 200), UwU::Coord2(600, 400), red, blue, alpha, red);
 
-  draw.trapezoid(UwU::Trapezoid(300, 400, 360, 360, 600, 401), green);
+  draw.trapezoid(UwU::Trapezoid(500, 400, 360, 360, 600, 401), green);
 
 
   draw.point(UwU::Coord2(387, 43), green);