Add TODO(#1248)

[nothing.git] / src / sdl / renderer.c

diff --git a/src/sdl/renderer.c b/src/sdl/renderer.c
index cbc9f75a134d17d0ef3b9faa9672967e47dc7ec1..29b842e8adb574a5c458ca2afe4a8cbf05edb006 100644 (file)
--- a/src/sdl/renderer.c
+++ b/src/sdl/renderer.c
@@ -1,19 +1,21 @@
-#include <assert.h>
-#include <SDL2/SDL.h>
-#include "./renderer.h"
-#include "./system/error.h"
+#include <SDL.h>
+#include "system/stacktrace.h"
+
+#include "renderer.h"
+#include "system/lt.h"
+#include "system/log.h"
 
 int draw_triangle(SDL_Renderer *render,
-                  triangle_t t)
+                  Triangle t)
 {
-    assert(render);
+    trace_assert(render);
 
     if (SDL_RenderDrawLine(render,
                            (int) roundf(t.p1.x),
                            (int) roundf(t.p1.y),
                            (int) roundf(t.p2.x),
                            (int) roundf(t.p2.y)) < 0) {
-        throw_error(ERROR_TYPE_SDL2);
+        log_fail("SDL_RenderDrawLine: %s\n", SDL_GetError());
         return -1;
     }
 
@@ -22,7 +24,7 @@ int draw_triangle(SDL_Renderer *render,
                            (int) roundf(t.p2.y),
                            (int) roundf(t.p3.x),
                            (int) roundf(t.p3.y)) < 0) {
-        throw_error(ERROR_TYPE_SDL2);
+        log_fail("SDL_RenderDrawLine: %s\n", SDL_GetError());
         return -1;
     }
 
@@ -31,7 +33,7 @@ int draw_triangle(SDL_Renderer *render,
                            (int) roundf(t.p3.y),
                            (int) roundf(t.p1.x),
                            (int) roundf(t.p1.y)) < 0) {
-        throw_error(ERROR_TYPE_SDL2);
+        log_fail("SDL_RenderDrawLine: %s\n", SDL_GetError());
         return -1;
     }
 
@@ -39,9 +41,9 @@ int draw_triangle(SDL_Renderer *render,
 }
 
 static int fill_bottom_flat_triangle(SDL_Renderer *render,
-                                     triangle_t t)
+                                     Triangle t)
 {
-    assert(render);
+    trace_assert(render);
 
     const float invslope1 = (t.p2.x - t.p1.x) / (t.p2.y - t.p1.y);
     const float invslope2 = (t.p3.x - t.p1.x) / (t.p3.y - t.p1.y);
@@ -68,9 +70,9 @@ static int fill_bottom_flat_triangle(SDL_Renderer *render,
 }
 
 static int fill_top_flat_triangle(SDL_Renderer *render,
-                                  triangle_t t)
+                                  Triangle t)
 {
-    assert(render);
+    trace_assert(render);
 
     const float invslope1 = (t.p3.x - t.p1.x) / (t.p3.y - t.p1.y);
     const float invslope2 = (t.p3.x - t.p2.x) / (t.p3.y - t.p2.y);
@@ -98,7 +100,7 @@ static int fill_top_flat_triangle(SDL_Renderer *render,
 }
 
 int fill_triangle(SDL_Renderer *render,
-                  triangle_t t)
+                  Triangle t)
 {
     t = triangle_sorted_by_y(t);
 
@@ -111,7 +113,7 @@ int fill_triangle(SDL_Renderer *render,
             return -1;
         }
     } else {
-        const point_t p4 = vec(t.p1.x + ((t.p2.y - t.p1.y) / (t.p3.y - t.p1.y)) * (t.p3.x - t.p1.x), t.p2.y);
+        const Vec2f p4 = vec(t.p1.x + ((t.p2.y - t.p1.y) / (t.p3.y - t.p1.y)) * (t.p3.x - t.p1.x), t.p2.y);
 
         if (fill_bottom_flat_triangle(render, triangle(t.p1, t.p2, p4)) < 0) {
             return -1;
@@ -132,3 +134,24 @@ int fill_triangle(SDL_Renderer *render,
 
     return 0;
 }
+
+int fill_rect(SDL_Renderer *render, Rect r, Color c)
+{
+    const SDL_Rect sdl_rect = rect_for_sdl(r);
+    const SDL_Color sdl_color = color_for_sdl(c);
+
+    if (SDL_SetRenderDrawColor(
+            render,
+            sdl_color.r, sdl_color.g,
+            sdl_color.b, sdl_color.a) < 0) {
+        log_fail("SDL_SetRenderDrawColor: %s\n", SDL_GetError());
+        return -1;
+    }
+
+    if (SDL_RenderFillRect(render, &sdl_rect) < 0) {
+        log_fail("SDL_RenderFillRect: %s\n");
+        return -1;
+    }
+
+    return 0;
+}