Merge pull request #1209 from isidentical/console-shortcuts

[nothing.git] / src / game / level / platforms.c

diff --git a/src/game/level/platforms.c b/src/game/level/platforms.c
index 71ac5cd3508f7cd96a03b8e271e95d9f5c30c130..55b98682b6f4b191e78a448f9a1f5257adadeb11 100644 (file)
--- a/src/game/level/platforms.c
+++ b/src/game/level/platforms.c
@@ -1,4 +1,4 @@
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "system/stacktrace.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -7,10 +7,10 @@
 
 #include "platforms.h"
 #include "system/lt.h"
-#include "system/lt/lt_adapters.h"
 #include "system/line_stream.h"
 #include "system/nth_alloc.h"
 #include "system/log.h"
+#include "game/level/level_editor/rect_layer.h"
 
 struct Platforms {
     Lt *lt;
@@ -20,53 +20,35 @@ struct Platforms {
     size_t rects_size;
 };
 
-Platforms *create_platforms_from_line_stream(LineStream *line_stream)
+Platforms *create_platforms_from_rect_layer(const RectLayer *layer)
 {
-    trace_assert(line_stream);
+    trace_assert(layer);
 
-    Lt *const lt = create_lt();
-    if (lt == NULL) {
-        return NULL;
-    }
+    Lt *lt = create_lt();
 
-    Platforms *platforms = PUSH_LT(lt, nth_alloc(sizeof(Platforms)), free);
+    Platforms *platforms = PUSH_LT(
+        lt,
+        nth_calloc(1, sizeof(Platforms)),
+        free);
     if (platforms == NULL) {
         RETURN_LT(lt, NULL);
     }
+    platforms->lt = lt;
 
-    platforms->rects_size = 0;
-    if (sscanf(
-            line_stream_next(line_stream),
-            "%lu",
-            &platforms->rects_size) == EOF) {
-        log_fail("Could not read amount of platforms\n");
-        RETURN_LT(lt, NULL);
-    }
+    platforms->rects_size = rect_layer_count(layer);
 
-    platforms->rects = PUSH_LT(lt, nth_alloc(sizeof(Rect) * platforms->rects_size), free);
+    platforms->rects = PUSH_LT(lt, nth_calloc(1, sizeof(Rect) * platforms->rects_size), free);
     if (platforms->rects == NULL) {
         RETURN_LT(lt, NULL);
     }
+    memcpy(platforms->rects, rect_layer_rects(layer), sizeof(Rect) * platforms->rects_size);
 
-    platforms->colors = PUSH_LT(lt, nth_alloc(sizeof(Color) * platforms->rects_size), free);
+
+    platforms->colors = PUSH_LT(lt, nth_calloc(1, sizeof(Color) * platforms->rects_size), free);
     if (platforms->colors == NULL) {
         RETURN_LT(lt, NULL);
     }
-
-    char color[7];
-    for (size_t i = 0; i < platforms->rects_size; ++i) {
-        if (sscanf(line_stream_next(line_stream),
-                   "%f%f%f%f%6s\n",
-                   &platforms->rects[i].x, &platforms->rects[i].y,
-                   &platforms->rects[i].w, &platforms->rects[i].h,
-                   color) < 0) {
-            log_fail("Could not read %dth platform\n", i);
-            RETURN_LT(lt, NULL);
-        }
-        platforms->colors[i] = hexstr(color);
-    }
-
-    platforms->lt = lt;
+    memcpy(platforms->colors, rect_layer_colors(layer), sizeof(Color) * platforms->rects_size);
 
     return platforms;
 }
@@ -77,49 +59,9 @@ void destroy_platforms(Platforms *platforms)
     RETURN_LT0(platforms->lt);
 }
 
-int platforms_save_to_file(const Platforms *platforms,
-                           const char *filename)
-{
-    trace_assert(platforms);
-    trace_assert(filename);
-
-    Lt *const lt = create_lt();
-    if (lt == NULL) {
-        return -1;
-    }
-
-    FILE *platforms_file = PUSH_LT(lt, fopen(filename, "w"), fclose_lt);
-
-    if (platforms_file == NULL) {
-        log_fail("Could not open file '%s': %s\n", filename, strerror(errno));
-        RETURN_LT(lt, -1);
-    }
-
-    for (size_t i = 0; i < platforms->rects_size; ++i) {
-        if (fprintf(platforms_file, "%f %f %f %f\n",
-                    platforms->rects[i].x, platforms->rects[i].y,
-                    platforms->rects[i].w, platforms->rects[i].h) < 0) {
-            log_fail("Could not read %dth platform\n", i);
-            RETURN_LT(lt, -1);
-        }
-    }
-
-    RETURN_LT(lt, 0);
-}
-
-Solid_ref platforms_as_solid(Platforms *platforms)
-{
-    Solid_ref ref = {
-        .tag = SOLID_PLATFORMS,
-        .ptr = (void*)platforms
-    };
-
-    return ref;
-}
-
 /* TODO(#450): platforms do not render their ids in debug mode */
 int platforms_render(const Platforms *platforms,
-                     Camera *camera)
+                     const Camera *camera)
 {
     for (size_t i = 0; i < platforms->rects_size; ++i) {
         if (camera_fill_rect(
@@ -144,16 +86,18 @@ void platforms_touches_rect_sides(const Platforms *platforms,
     }
 }
 
-Rect platforms_snap_rect(const Platforms *platforms,
-                         Rect object)
+Vec2f platforms_snap_rect(const Platforms *platforms,
+                         Rect *object)
 {
     trace_assert(platforms);
 
+    Vec2f result = vec(1.0f, 1.0f);
     for (size_t i = 0; i < platforms->rects_size; ++i) {
-        if (rects_overlap(platforms->rects[i], object)) {
-            object = rect_snap(platforms->rects[i], object);
+        if (rects_overlap(platforms->rects[i], *object)) {
+            // TODO(#1161): can we reuse the Level Editor snapping mechanism in physics snapping
+            result = vec_entry_mult(result, rect_snap(platforms->rects[i], object));
         }
     }
 
-    return object;
+    return result;
 }