#include "system/lt.h"
#include "system/nth_alloc.h"
#include "system/stacktrace.h"
+#include "system/line_stream.h"
+#include "system/str.h"
+#include "system/log.h"
+#include "hashset.h"
#include "./rigid_bodies.h"
-#define ID_SIZE 100
-
struct RigidBodies
{
Lt *lt;
size_t capacity;
size_t count;
- char *id;
Rect *bodies;
Vec *velocities;
Vec *movements;
- Color *colors;
bool *grounded;
Vec *forces;
+ bool *deleted;
+ HashSet *collided;
+ bool *disabled;
};
RigidBodies *create_rigid_bodies(size_t capacity)
{
Lt *lt = create_lt();
- if (lt == NULL) {
- return NULL;
- }
RigidBodies *rigid_bodies = PUSH_LT(lt, nth_calloc(1, sizeof(RigidBodies)), free);
if (rigid_bodies == NULL) {
rigid_bodies->capacity = capacity;
rigid_bodies->count = 0;
- rigid_bodies->id = PUSH_LT(
- lt,
- nth_calloc(ID_SIZE, sizeof(char)),
- free);
- if (rigid_bodies->id == NULL) {
- RETURN_LT(lt, NULL);
- }
-
rigid_bodies->bodies = PUSH_LT(lt, nth_calloc(capacity, sizeof(Rect)), free);
if (rigid_bodies->bodies == NULL) {
RETURN_LT(lt, NULL);
RETURN_LT(lt, NULL);
}
- rigid_bodies->colors = PUSH_LT(lt, nth_calloc(capacity, sizeof(Color)), free);
- if (rigid_bodies->colors == NULL) {
- RETURN_LT(lt, NULL);
- }
-
rigid_bodies->grounded = PUSH_LT(lt, nth_calloc(capacity, sizeof(bool)), free);
if (rigid_bodies->grounded == NULL) {
RETURN_LT(lt, NULL);
RETURN_LT(lt, NULL);
}
+ rigid_bodies->deleted = PUSH_LT(lt, nth_calloc(capacity, sizeof(bool)), free);
+ if (rigid_bodies->deleted == NULL) {
+ RETURN_LT(lt, NULL);
+ }
+
+ rigid_bodies->collided = PUSH_LT(
+ lt,
+ create_hashset(sizeof(size_t) * 2, capacity * 2),
+ destroy_hashset);
+ if (rigid_bodies->collided == NULL) {
+ RETURN_LT(lt, NULL);
+ }
+
+ rigid_bodies->disabled = PUSH_LT(
+ lt,
+ nth_calloc(capacity, sizeof(bool)),
+ free);
+ if (rigid_bodies->disabled == NULL) {
+ RETURN_LT(lt, NULL);
+ }
+
return rigid_bodies;
}
return 0;
}
- for (size_t i1 = 0; i1 < rigid_bodies->count - 1; ++i1) {
- for (size_t i2 = i1 + 1; i2 < rigid_bodies->count; ++i2) {
- // TODO(#654): Rigid Bodies don't exchange forces with each other
- if (!rects_overlap(rigid_bodies->bodies[i1], rigid_bodies->bodies[i2])) {
+ size_t pair[2];
+ hashset_clear(rigid_bodies->collided);
+
+ bool the_variable_that_gets_set_when_a_collision_happens_xd = true;
+
+ for (size_t i = 0; i < 1000 && the_variable_that_gets_set_when_a_collision_happens_xd; ++i) {
+ the_variable_that_gets_set_when_a_collision_happens_xd = false;
+ for (size_t i1 = 0; i1 < rigid_bodies->count - 1; ++i1) {
+ if (rigid_bodies->deleted[i1] || rigid_bodies->disabled[i1]) {
continue;
}
- const Vec orient = rect_impulse(&rigid_bodies->bodies[i1], &rigid_bodies->bodies[i2]);
- const Vec v = vec_sub(vec(1.0f, 1.0f), orient);
+ for (size_t i2 = i1 + 1; i2 < rigid_bodies->count; ++i2) {
+ if (rigid_bodies->deleted[i2] || rigid_bodies->disabled[i1]) {
+ continue;
+ }
+
+ if (!rects_overlap(rigid_bodies->bodies[i1], rigid_bodies->bodies[i2])) {
+ continue;
+ }
+
+ the_variable_that_gets_set_when_a_collision_happens_xd = true;
+
+ pair[0] = i1;
+ pair[1] = i2;
+ hashset_insert(rigid_bodies->collided, pair);
+
+ Vec orient = rect_impulse(&rigid_bodies->bodies[i1], &rigid_bodies->bodies[i2]);
- rigid_bodies->velocities[i1] = vec_entry_mult(rigid_bodies->velocities[i1], v);
- rigid_bodies->velocities[i2] = vec_entry_mult(rigid_bodies->velocities[i2], v);
+ if (orient.x > orient.y) {
+ if (rigid_bodies->bodies[i1].y < rigid_bodies->bodies[i2].y) {
+ rigid_bodies->grounded[i1] = true;
+ } else {
+ rigid_bodies->grounded[i2] = true;
+ }
+ }
+
+ rigid_bodies->velocities[i1] = vec(rigid_bodies->velocities[i1].x * orient.x, rigid_bodies->velocities[i1].y * orient.y);
+ rigid_bodies->velocities[i2] = vec(rigid_bodies->velocities[i2].x * orient.x, rigid_bodies->velocities[i2].y * orient.y);
+ rigid_bodies->movements[i1] = vec(rigid_bodies->movements[i1].x * orient.x, rigid_bodies->movements[i1].y * orient.y);
+ rigid_bodies->movements[i2] = vec(rigid_bodies->movements[i2].x * orient.x, rigid_bodies->movements[i2].y * orient.y);
+
+ }
}
}
+ size_t *collided = hashset_values(rigid_bodies->collided);
+ const size_t n = hashset_count(rigid_bodies->collided);
+ for (size_t i = 0; i < n; ++i) {
+ const size_t i1 = *(collided + i * 2);
+ const size_t i2 = *(collided + i * 2 + 1);
+
+ rigid_bodies_apply_force(
+ rigid_bodies, i1, vec_sum(rigid_bodies->velocities[i2], rigid_bodies->movements[i2]));
+ rigid_bodies_apply_force(
+ rigid_bodies, i2, vec_sum(rigid_bodies->velocities[i1], rigid_bodies->movements[i1]));
+ }
+
return 0;
}
int sides[RECT_SIDE_N] = { 0, 0, 0, 0 };
for (size_t i = 0; i < rigid_bodies->count; ++i) {
+ if (rigid_bodies->deleted[i] || rigid_bodies->disabled[i]) {
+ continue;
+ }
+
memset(sides, 0, sizeof(int) * RECT_SIDE_N);
platforms_touches_rect_sides(platforms, rigid_bodies->bodies[i], sides);
int rigid_bodies_collide(RigidBodies *rigid_bodies,
const Platforms *platforms)
{
+ // TODO(#683): RigidBodies should collide only the bodies that were updated on after a previous collision
+ memset(rigid_bodies->grounded, 0, sizeof(bool) * rigid_bodies->count);
+
if (rigid_bodies_collide_with_itself(rigid_bodies) < 0) {
return -1;
}
}
int rigid_bodies_update(RigidBodies *rigid_bodies,
+ RigidBodyId id,
float delta_time)
{
trace_assert(rigid_bodies);
- memset(rigid_bodies->grounded, 0,
- sizeof(bool) * rigid_bodies->count);
+ if (rigid_bodies->deleted[id] || rigid_bodies->disabled[id]) {
+ return 0;
+ }
- for (size_t i = 0; i < rigid_bodies->count; ++i) {
- rigid_bodies->velocities[i] = vec_sum(
- rigid_bodies->velocities[i],
+ rigid_bodies->velocities[id] = vec_sum(
+ rigid_bodies->velocities[id],
vec_scala_mult(
- rigid_bodies->forces[i],
+ rigid_bodies->forces[id],
delta_time));
- }
- for (size_t i = 0; i < rigid_bodies->count; ++i) {
- Vec position = vec(rigid_bodies->bodies[i].x,
- rigid_bodies->bodies[i].y);
+ Vec position = vec(rigid_bodies->bodies[id].x,
+ rigid_bodies->bodies[id].y);
- position = vec_sum(
- position,
- vec_scala_mult(
- vec_sum(
- rigid_bodies->velocities[i],
- rigid_bodies->movements[i]),
- delta_time));
+ position = vec_sum(
+ position,
+ vec_scala_mult(
+ vec_sum(
+ rigid_bodies->velocities[id],
+ rigid_bodies->movements[id]),
+ delta_time));
- rigid_bodies->bodies[i].x = position.x;
- rigid_bodies->bodies[i].y = position.y;
- }
+ rigid_bodies->bodies[id].x = position.x;
+ rigid_bodies->bodies[id].y = position.y;
- memset(rigid_bodies->forces, 0,
- sizeof(Vec) * rigid_bodies->count);
+ rigid_bodies->forces[id] = vec(0.0f, 0.0f);
return 0;
}
int rigid_bodies_render(RigidBodies *rigid_bodies,
+ RigidBodyId id,
+ Color color,
Camera *camera)
{
trace_assert(rigid_bodies);
trace_assert(camera);
- for (size_t i = 0; i < rigid_bodies->count; ++i) {
- if (camera_fill_rect(
- camera,
- rigid_bodies->bodies[i],
- rigid_bodies->colors[i]) < 0) {
- return -1;
- }
+ if (rigid_bodies->deleted[id] || rigid_bodies->disabled[id]) {
+ return 0;
+ }
- snprintf(rigid_bodies->id, ID_SIZE, "%ld", i);
+ char text_buffer[256];
- if (camera_render_debug_text(
- camera,
- rigid_bodies->id,
- vec(rigid_bodies->bodies[i].x,
- rigid_bodies->bodies[i].y)) < 0) {
- return -1;
- }
+ if (camera_fill_rect(
+ camera,
+ rigid_bodies->bodies[id],
+ color) < 0) {
+ return -1;
+ }
+
+ snprintf(text_buffer, 256, "id: %ld", id);
+
+ if (camera_render_debug_text(
+ camera,
+ text_buffer,
+ vec(rigid_bodies->bodies[id].x,
+ rigid_bodies->bodies[id].y)) < 0) {
+ return -1;
+ }
+
+ snprintf(text_buffer, 256, "p:(%.2f, %.2f)",
+ rigid_bodies->bodies[id].x,
+ rigid_bodies->bodies[id].y);
+ if (camera_render_debug_text(
+ camera,
+ text_buffer,
+ vec(rigid_bodies->bodies[id].x,
+ rigid_bodies->bodies[id].y + FONT_CHAR_HEIGHT * 2.0f))) {
+ return -1;
+ }
+
+ snprintf(text_buffer, 256, "v:(%.2f, %.2f)",
+ rigid_bodies->velocities[id].x,
+ rigid_bodies->velocities[id].y);
+ if (camera_render_debug_text(
+ camera,
+ text_buffer,
+ vec(rigid_bodies->bodies[id].x,
+ rigid_bodies->bodies[id].y + FONT_CHAR_HEIGHT * 4.0f))) {
+ return -1;
+ }
+
+ snprintf(text_buffer, 256, "m:(%.2f, %.2f)",
+ rigid_bodies->movements[id].x,
+ rigid_bodies->movements[id].y);
+ if (camera_render_debug_text(
+ camera,
+ text_buffer,
+ vec(rigid_bodies->bodies[id].x,
+ rigid_bodies->bodies[id].y + FONT_CHAR_HEIGHT * 6.0f))) {
+ return -1;
}
return 0;
}
RigidBodyId rigid_bodies_add(RigidBodies *rigid_bodies,
- Rect rect,
- Color color)
+ Rect rect)
{
trace_assert(rigid_bodies);
trace_assert(rigid_bodies->count < rigid_bodies->capacity);
RigidBodyId id = rigid_bodies->count++;
rigid_bodies->bodies[id] = rect;
- rigid_bodies->colors[id] = color;
return id;
}
+void rigid_bodies_remove(RigidBodies *rigid_bodies,
+ RigidBodyId id)
+{
+ trace_assert(rigid_bodies);
+ trace_assert(id < rigid_bodies->capacity);
+
+ rigid_bodies->deleted[id] = true;
+}
+
Rect rigid_bodies_hitbox(const RigidBodies *rigid_bodies,
RigidBodyId id)
{
trace_assert(rigid_bodies);
trace_assert(id < rigid_bodies->count);
+ if (rigid_bodies->deleted[id] || rigid_bodies->disabled[id]) {
+ return;
+ }
+
rigid_bodies->movements[id] = movement;
}
trace_assert(rigid_bodies);
trace_assert(id < rigid_bodies->count);
+ if (rigid_bodies->deleted[id] || rigid_bodies->disabled[id]) {
+ return;
+ }
+
rigid_bodies->forces[id] = vec_sum(rigid_bodies->forces[id], force);
}
trace_assert(rigid_bodies);
trace_assert(id < rigid_bodies->count);
+ if (rigid_bodies->deleted[id] || rigid_bodies->disabled[id]) {
+ return;
+ }
+
rigid_bodies->velocities[id] = point_mat3x3_product(
rigid_bodies->velocities[id],
trans_mat);
trace_assert(rigid_bodies);
trace_assert(id < rigid_bodies->count);
+ if (rigid_bodies->deleted[id] || rigid_bodies->disabled[id]) {
+ return;
+ }
+
rigid_bodies->bodies[id].x = position.x;
rigid_bodies->bodies[id].y = position.y;
}
trace_assert(rigid_bodies);
trace_assert(id < rigid_bodies->count);
+ if (rigid_bodies->deleted[id] || rigid_bodies->disabled[id]) {
+ return;
+ }
+
rigid_bodies_apply_force(
rigid_bodies, id,
vec(
rigid_bodies->velocities[id].x * v.x,
rigid_bodies->velocities[id].y * v.y));
}
+
+void rigid_bodies_disable(RigidBodies *rigid_bodies,
+ RigidBodyId id,
+ bool disabled)
+{
+ trace_assert(rigid_bodies);
+ trace_assert(id < rigid_bodies->count);
+
+ rigid_bodies->disabled[id] = disabled;
+}
projects / nothing.git / blobdiff