Merge pull request #1255 from tsoding/1253

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

diff --git a/src/game/level/lava.c b/src/game/level/lava.c
index 2c338b40ca9d405a68c13018991d7149b892dde9..ec580d4c075fe526ffac321a4f0ba7d5ee13990e 100644 (file)
--- a/src/game/level/lava.c
+++ b/src/game/level/lava.c
@@ -1,14 +1,15 @@
-#include <SDL2/SDL.h>
-#include <assert.h>
+#include <SDL.h>
+#include "system/stacktrace.h"
 #include <stdio.h>
 
 #include "color.h"
 #include "game/level/lava/wavy_rect.h"
-#include "game/level/player/rigid_rect.h"
 #include "lava.h"
 #include "math/rect.h"
-#include "system/error.h"
 #include "system/lt.h"
+#include "system/nth_alloc.h"
+#include "system/log.h"
+#include "game/level/level_editor/rect_layer.h"
 
 #define LAVA_BOINGNESS 2500.0f
 
@@ -18,56 +19,46 @@ struct Lava {
     Wavy_rect **rects;
 };
 
-Lava *create_lava_from_stream(FILE *stream)
+Lava *create_lava_from_rect_layer(const RectLayer *rect_layer)
 {
-    assert(stream);
-
     Lt *lt = create_lt();
-    if (lt == NULL) {
-        return NULL;
-    }
 
-    Lava *lava = PUSH_LT(lt, malloc(sizeof(Lava)), free);
+    Lava *lava = PUSH_LT(lt, nth_calloc(1, sizeof(Lava)), free);
     if (lava == NULL) {
-        throw_error(ERROR_TYPE_LIBC);
-        RETURN_LT(lt, NULL);
-    }
-
-    if (fscanf(stream, "%lu", &lava->rects_count) < 0) {
-        throw_error(ERROR_TYPE_LIBC);
         RETURN_LT(lt, NULL);
     }
+    lava->lt = lt;
 
-    lava->rects = PUSH_LT(lt, malloc(sizeof(Wavy_rect*) * lava->rects_count), free);
+    lava->rects_count = rect_layer_count(rect_layer);
+    lava->rects = PUSH_LT(lt, nth_calloc(lava->rects_count, sizeof(Wavy_rect*)), free);
     if (lava->rects == NULL) {
-        throw_error(ERROR_TYPE_LIBC);
         RETURN_LT(lt, NULL);
     }
 
+    const Rect *rects = rect_layer_rects(rect_layer);
+    const Color *colors = rect_layer_colors(rect_layer);
     for (size_t i = 0; i < lava->rects_count; ++i) {
-        lava->rects[i] = PUSH_LT(lt, create_wavy_rect_from_stream(stream), destroy_wavy_rect);
+        lava->rects[i] = PUSH_LT(lt, create_wavy_rect(rects[i], colors[i]), destroy_wavy_rect);
         if (lava->rects[i] == NULL) {
             RETURN_LT(lt, NULL);
         }
     }
 
-    lava->lt = lt;
-
     return lava;
 }
 
 void destroy_lava(Lava *lava)
 {
-    assert(lava);
+    trace_assert(lava);
     RETURN_LT0(lava->lt);
 }
 
-/* TODO: lava does not render its id in debug mode */
+/* TODO(#449): lava does not render its id in debug mode */
 int lava_render(const Lava *lava,
-                Camera *camera)
+                const Camera *camera)
 {
-    assert(lava);
-    assert(camera);
+    trace_assert(lava);
+    trace_assert(camera);
 
     for (size_t i = 0; i < lava->rects_count; ++i) {
         if (wavy_rect_render(lava->rects[i], camera) < 0) {
@@ -80,7 +71,7 @@ int lava_render(const Lava *lava,
 
 int lava_update(Lava *lava, float delta_time)
 {
-    assert(lava);
+    trace_assert(lava);
 
     for (size_t i = 0; i < lava->rects_count; ++i) {
         if (wavy_rect_update(lava->rects[i], delta_time) < 0) {
@@ -94,7 +85,7 @@ int lava_update(Lava *lava, float delta_time)
 bool lava_overlaps_rect(const Lava *lava,
                         Rect rect)
 {
-    assert(lava);
+    trace_assert(lava);
 
     for (size_t i = 0; i < lava->rects_count; ++i) {
         if (rects_overlap(wavy_rect_hitbox(lava->rects[i]), rect)) {
@@ -105,20 +96,21 @@ bool lava_overlaps_rect(const Lava *lava,
     return 0;
 }
 
-void lava_float_rigid_rect(Lava *lava, Rigid_rect *object)
+void lava_float_rigid_body(Lava *lava, RigidBodies *rigid_bodies, RigidBodyId id)
 {
-    assert(lava);
+    trace_assert(lava);
 
-    const Rect object_hitbox = rigid_rect_hitbox(object);
+    const Rect object_hitbox = rigid_bodies_hitbox(rigid_bodies, id);
     for (size_t i = 0; i < lava->rects_count; ++i) {
         const Rect lava_hitbox = wavy_rect_hitbox(lava->rects[i]);
         if (rects_overlap(object_hitbox, lava_hitbox)) {
             const Rect overlap_area = rects_overlap_area(object_hitbox, lava_hitbox);
             const float k = overlap_area.w * overlap_area.h / (object_hitbox.w * object_hitbox.h);
-            rigid_rect_apply_force(
-                object,
+            rigid_bodies_apply_force(
+                rigid_bodies,
+                id,
                 vec(0.0f, -k * LAVA_BOINGNESS));
-            rigid_rect_damper(object, vec(0.0f, -0.9f));
+            rigid_bodies_damper(rigid_bodies, id, vec(0.0f, -0.9f));
         }
     }
 }