(#819) Integrate LevelEditor Regions with Level

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

diff --git a/src/game/level/boxes.c b/src/game/level/boxes.c
index e149fb4b94a60d62e9fdb6f25c577f59c9ba47a5..e070234f64d3217d0c9cadaa58da3539da2657ca 100644 (file)
--- a/src/game/level/boxes.c
+++ b/src/game/level/boxes.c
@@ -5,7 +5,7 @@
 #include "ebisp/builtins.h"
 #include "ebisp/interpreter.h"
 #include "game/level/boxes.h"
-#include "game/level/level_editor/layer.h"
+#include "game/level/level_editor/rect_layer.h"
 #include "game/level/player.h"
 #include "game/level/rigid_bodies.h"
 #include "math/rand.h"
@@ -15,8 +15,6 @@
 #include "system/nth_alloc.h"
 #include "system/str.h"
 
-#define BOXES_MAX_ID_SIZE 36
-
 struct Boxes
 {
     Lt *lt;
@@ -25,82 +23,14 @@ struct Boxes
     Dynarray *body_colors;
 };
 
-Boxes *create_boxes_from_line_stream(LineStream *line_stream, RigidBodies *rigid_bodies)
-{
-    trace_assert(line_stream);
-
-    Lt *lt = create_lt();
-
-    if (lt == NULL) {
-        return NULL;
-    }
-
-    Boxes *boxes = PUSH_LT(lt, nth_alloc(sizeof(Boxes)), free);
-    if (boxes == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-    boxes->lt = lt;
-
-    boxes->rigid_bodies = rigid_bodies;
-
-    boxes->body_ids = PUSH_LT(lt, create_dynarray(sizeof(RigidBodyId)), destroy_dynarray);
-    if (boxes->body_ids == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    boxes->body_colors = PUSH_LT(lt, create_dynarray(sizeof(Color)), destroy_dynarray);
-    if (boxes->body_colors == NULL) {
-        RETURN_LT(lt, NULL);
-    }
-
-    size_t count = 0;
-
-    if (sscanf(
-            line_stream_next(line_stream),
-            "%lu",
-            &count) == EOF) {
-        log_fail("Could not read amount of boxes\n");
-        RETURN_LT(lt, NULL);
-    }
-
-    for (size_t i = 0; i < count; ++i) {
-        char color[7];
-        Rect rect;
-        // TODO(#807): box id is ignored
-        char id[BOXES_MAX_ID_SIZE];
-
-        if (sscanf(line_stream_next(line_stream),
-                   "%" STRINGIFY(BOXES_MAX_ID_SIZE) "s%f%f%f%f%6s\n",
-                   id,
-                   &rect.x, &rect.y,
-                   &rect.w, &rect.h,
-                   color) < 0) {
-            log_fail("Could not read rigid rect\n");
-            RETURN_LT(lt, NULL);
-        }
-
-        const                   // North Const 4Head
-        Color box_color = hexstr(color);
-        RigidBodyId const body_id = rigid_bodies_add(rigid_bodies, rect);
-
-        dynarray_push(boxes->body_colors, &box_color);
-        dynarray_push(boxes->body_ids, &body_id);
-    }
-
-    return boxes;
-}
-
-Boxes *create_boxes_from_layer(const Layer *layer, RigidBodies *rigid_bodies)
+Boxes *create_boxes_from_rect_layer(const RectLayer *layer, RigidBodies *rigid_bodies)
 {
     trace_assert(layer);
     trace_assert(rigid_bodies);
 
     Lt *lt = create_lt();
-    if (lt == NULL) {
-        return NULL;
-    }
 
-    Boxes *boxes = PUSH_LT(lt, nth_alloc(sizeof(Boxes)), free);
+    Boxes *boxes = PUSH_LT(lt, nth_calloc(1, sizeof(Boxes)), free);
     if (boxes == NULL) {
         RETURN_LT(lt, NULL);
     }
@@ -118,9 +48,9 @@ Boxes *create_boxes_from_layer(const Layer *layer, RigidBodies *rigid_bodies)
         RETURN_LT(lt, NULL);
     }
 
-    const size_t count = layer_count(layer);
-    Rect const *rects = layer_rects(layer);
-    Color const *colors = layer_colors(layer);
+    const size_t count = rect_layer_count(layer);
+    Rect const *rects = rect_layer_rects(layer);
+    Color const *colors = rect_layer_colors(layer);
 
     for (size_t i = 0; i < count; ++i) {
         RigidBodyId body_id = rigid_bodies_add(rigid_bodies, rects[i]);