#include "system/stacktrace.h"
+#include "broadcast.h"
+#include "dynarray.h"
+#include "ebisp/builtins.h"
+#include "ebisp/interpreter.h"
#include "game/level/boxes.h"
+#include "game/level/level_editor/rect_layer.h"
#include "game/level/player.h"
-#include "game/level/player/rigid_rect.h"
+#include "game/level/rigid_bodies.h"
+#include "math/rand.h"
#include "system/line_stream.h"
+#include "system/log.h"
#include "system/lt.h"
#include "system/nth_alloc.h"
-#include "system/log.h"
-#include "ebisp/interpreter.h"
-#include "ebisp/builtins.h"
-#include "broadcast.h"
-#include "game/level/rigid_bodies.h"
-
-/* TODO(#631): Boxes entity should be implemented in terms of RigidBodies instead of Rigid_rect */
-
-#define BOXES_CAPACITY 100
+#include "system/str.h"
struct Boxes
{
Lt *lt;
RigidBodies *rigid_bodies;
- RigidBodyId *body_ids;
- size_t count;
+ Dynarray *body_ids;
+ Dynarray *body_colors;
};
-Boxes *create_boxes_from_line_stream(LineStream *line_stream, RigidBodies *rigid_bodies)
+Boxes *create_boxes_from_rect_layer(const RectLayer *layer, RigidBodies *rigid_bodies)
{
- trace_assert(line_stream);
+ 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);
}
boxes->rigid_bodies = rigid_bodies;
- if (sscanf(
- line_stream_next(line_stream),
- "%lu",
- &boxes->count) == EOF) {
- log_fail("Could not read amount of boxes\n");
+ boxes->body_ids = PUSH_LT(lt, create_dynarray(sizeof(RigidBodyId)), destroy_dynarray);
+ if (boxes->body_ids == NULL) {
RETURN_LT(lt, NULL);
}
- boxes->body_ids = PUSH_LT(lt, nth_alloc(sizeof(RigidBodyId) * boxes->count), free);
- if (boxes->body_ids == NULL) {
+ boxes->body_colors = PUSH_LT(lt, create_dynarray(sizeof(Color)), destroy_dynarray);
+ if (boxes->body_colors == NULL) {
RETURN_LT(lt, NULL);
}
- for (size_t i = 0; i < boxes->count; ++i) {
- boxes->body_ids[i] = rigid_bodies_add_from_line_stream(boxes->rigid_bodies, line_stream);
+ 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]);
+ dynarray_push(boxes->body_ids, &body_id);
+ dynarray_push(boxes->body_colors, &colors[i]);
}
return boxes;
void destroy_boxes(Boxes *boxes)
{
trace_assert(boxes);
+
+ const size_t count = dynarray_count(boxes->body_ids);
+ RigidBodyId *body_ids = dynarray_data(boxes->body_ids);
+
+ for (size_t i = 0; i < count; ++i) {
+ rigid_bodies_remove(boxes->rigid_bodies, body_ids[i]);
+ }
+
RETURN_LT0(boxes->lt);
}
trace_assert(boxes);
trace_assert(camera);
- for (size_t i = 0; i < boxes->count; ++i) {
- if (rigid_bodies_render(boxes->rigid_bodies, boxes->body_ids[i], camera) < 0) {
+ const size_t count = dynarray_count(boxes->body_ids);
+ RigidBodyId *body_ids = dynarray_data(boxes->body_ids);
+ Color *body_colors = dynarray_data(boxes->body_colors);
+
+ for (size_t i = 0; i < count; ++i) {
+ if (rigid_bodies_render(
+ boxes->rigid_bodies,
+ body_ids[i],
+ body_colors[i],
+ camera) < 0) {
return -1;
}
}
trace_assert(boxes);
trace_assert(delta_time);
- for (size_t i = 0; i < boxes->count; ++i) {
- if (rigid_bodies_update(boxes->rigid_bodies, boxes->body_ids[i], delta_time) < 0) {
+ const size_t count = dynarray_count(boxes->body_ids);
+ RigidBodyId *body_ids = dynarray_data(boxes->body_ids);
+
+ for (size_t i = 0; i < count; ++i) {
+ if (rigid_bodies_update(boxes->rigid_bodies, body_ids[i], delta_time) < 0) {
return -1;
}
}
trace_assert(boxes);
trace_assert(lava);
- for (size_t i = 0; i < boxes->count; ++i) {
- lava_float_rigid_body(lava, boxes->rigid_bodies, boxes->body_ids[i]);
+ const size_t count = dynarray_count(boxes->body_ids);
+ RigidBodyId *body_ids = dynarray_data(boxes->body_ids);
+
+ for (size_t i = 0; i < count; ++i) {
+ lava_float_rigid_body(lava, boxes->rigid_bodies, body_ids[i]);
}
}
-static
int boxes_add_box(Boxes *boxes, Rect rect, Color color)
{
trace_assert(boxes);
- trace_assert(boxes->count < BOXES_CAPACITY);
- boxes->body_ids[boxes->count++] = rigid_bodies_add(boxes->rigid_bodies, rect, color);
+ RigidBodyId body_id = rigid_bodies_add(boxes->rigid_bodies, rect);
+ dynarray_push(boxes->body_ids, &body_id);
+ dynarray_push(boxes->body_colors, &color);
return 0;
}
const char *action = target.atom->str;
if (strcmp(action, "new") == 0) {
- const char *color = NULL;
+ struct Expr optional_args = void_expr();
long int x, y, w, h;
- res = match_list(gc, "dddds", rest, &x, &y, &w, &h, &color);
+ res = match_list(gc, "dddd*", rest, &x, &y, &w, &h, &optional_args);
if (res.is_error) {
return res;
}
- boxes_add_box(boxes, rect((float) x, (float) y, (float) w, (float) h), hexstr(color));
+ Color color = rgba(rand_float(1.0f), rand_float(1.0f), rand_float(1.0f), 1.0f);
+ if (!nil_p(optional_args)) {
+ const char *color_hex = NULL;
+ res = match_list(gc, "s*", optional_args, &color_hex, NULL);
+ color = hexstr(color_hex);
+ }
+
+ boxes_add_box(boxes, rect((float) x, (float) y, (float) w, (float) h), color);
return eval_success(NIL(gc));
}
return wrong_argument_type(gc, "string-or-symbol-p", target);
}
+
+
+int boxes_delete_at(Boxes *boxes, Vec position)
+{
+ trace_assert(boxes);
+
+ const size_t count = dynarray_count(boxes->body_ids);
+ RigidBodyId *body_ids = dynarray_data(boxes->body_ids);
+
+ for (size_t i = 0; i < count; ++i) {
+ const Rect hitbox = rigid_bodies_hitbox(
+ boxes->rigid_bodies,
+ body_ids[i]);
+ if (rect_contains_point(hitbox, position)) {
+ rigid_bodies_remove(boxes->rigid_bodies, body_ids[i]);
+ dynarray_delete_at(boxes->body_ids, i);
+ dynarray_delete_at(boxes->body_colors, i);
+ return 0;
+ }
+ }
+
+ return 0;
+}