Merge pull request #924 from RIscRIpt/manual_sdl2

[nothing.git] / src / math / triangle.c

diff --git a/src/math/triangle.c b/src/math/triangle.c
index 14ccefe2b4552c315e2f76da6fb00843462f99c7..91b473503eb9a4a23a90bfc8ad3ff17b9a8b90b7 100644 (file)
--- a/src/math/triangle.c
+++ b/src/math/triangle.c
@@ -5,9 +5,9 @@
 #include "math/rand.h"
 #include "triangle.h"
 
-triangle_t triangle(point_t p1, point_t p2, point_t p3)
+Triangle triangle(Point p1, Point p2, Point p3)
 {
-    const triangle_t result = {
+    const Triangle result = {
         .p1 = p1,
         .p2 = p2,
         .p3 = p3
@@ -16,11 +16,11 @@ triangle_t triangle(point_t p1, point_t p2, point_t p3)
     return result;
 }
 
-triangle_t equilateral_triangle(void)
+Triangle equilateral_triangle(void)
 {
     const float d = PI_2 / 3.0f;
 
-    const triangle_t result = {
+    const Triangle result = {
         .p1 = vec(cosf(0.0f), sinf(0.0f)),
         .p2 = vec(cosf(d), sinf(d)),
         .p3 = vec(cosf(2.0f * d), sinf(2.0f * d))
@@ -29,8 +29,7 @@ triangle_t equilateral_triangle(void)
     return result;
 }
 
-/* TODO(#151): some of the random triangles are too thin */
-triangle_t random_triangle(float radius)
+Triangle random_triangle(float radius)
 {
     return triangle(
         vec_from_polar(rand_float(2 * PI), rand_float(radius)),
@@ -38,14 +37,14 @@ triangle_t random_triangle(float radius)
         vec_from_polar(rand_float(2 * PI), rand_float(radius)));
 }
 
-static void swap_points(point_t *p1, point_t *p2)
+static void swap_points(Point *p1, Point *p2)
 {
-    point_t t = *p1;
+    Point t = *p1;
     *p1 = *p2;
     *p2 = t;
 }
 
-triangle_t triangle_sorted_by_y(triangle_t t)
+Triangle triangle_sorted_by_y(Triangle t)
 {
     if (t.p1.y > t.p2.y) { swap_points(&t.p1, &t.p2); }
     if (t.p2.y > t.p3.y) { swap_points(&t.p2, &t.p3); }
@@ -54,15 +53,15 @@ triangle_t triangle_sorted_by_y(triangle_t t)
     return t;
 }
 
-void rect_as_triangles(rect_t rect, triangle_t triangles[2])
+void rect_as_triangles(Rect rect, Triangle triangles[2])
 {
-    triangle_t t1 = {
+    Triangle t1 = {
         .p1 = { .x = rect.x, .y = rect.y },
         .p2 = { .x = rect.x + rect.w, .y = rect.y },
         .p3 = { .x = rect.x, .y = rect.y + rect.h }
     };
 
-    triangle_t t2 = {
+    Triangle t2 = {
         .p1 = { .x = rect.x + rect.w, .y = rect.y },
         .p2 = { .x = rect.x, .y = rect.y + rect.h },
         .p3 = { .x = rect.x + rect.w, .y = rect.y + rect.h }
@@ -72,9 +71,9 @@ void rect_as_triangles(rect_t rect, triangle_t triangles[2])
     triangles[1] = t2;
 }
 
-triangle_t triangle_mat3x3_product(triangle_t t, mat3x3 m)
+Triangle triangle_mat3x3_product(Triangle t, mat3x3 m)
 {
-    triangle_t t1 = {
+    Triangle t1 = {
         .p1 = point_mat3x3_product(t.p1, m),
         .p2 = point_mat3x3_product(t.p2, m),
         .p3 = point_mat3x3_product(t.p3, m)