From 4047d04686fde56ce3eb190d3360f0a172b3b0e8 Mon Sep 17 00:00:00 2001
From: Sara <sara@saragerretsen.nl>
Date: Tue, 24 Oct 2023 23:15:29 +0200
Subject: [PATCH] renamed physics_entity_solve_contacts (was
default_contact_solver)
---
src/physics_entity.c | 2 +-
src/physics_entity.h | 2 +-
src/player.c | 2 +-
src/tilemap.c | 3 ++-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/physics_entity.c b/src/physics_entity.c
index e379298..f02c7b5 100644
--- a/src/physics_entity.c
+++ b/src/physics_entity.c
@@ -63,7 +63,7 @@ void physics_entity_apply_collision_forces(PhysicsEntity self, List* contacts) {
}
-void default_contact_solver(PhysicsEntity self, List* contacts) {
+void physics_entity_solve_contacts(PhysicsEntity self, List* contacts) {
RigidBody* body = self.tc->get_rigidbody(self.data);
const Transform pre_solve = *rigidbody_get_transform(body);
// attempt to solve constraints
diff --git a/src/physics_entity.h b/src/physics_entity.h
index 63dbc80..7459774 100644
--- a/src/physics_entity.h
+++ b/src/physics_entity.h
@@ -23,7 +23,7 @@ typedef struct {
} PhysicsEntity;
extern void physics_entity_debug_draw(PhysicsEntity self);
-extern void default_contact_solver(PhysicsEntity self, List* contacts);
+extern void physics_entity_solve_contacts(PhysicsEntity self, List* contacts);
extern void physics_entity_update(PhysicsEntity self);
diff --git a/src/player.c b/src/player.c
index 80b5ad2..49a0235 100644
--- a/src/player.c
+++ b/src/player.c
@@ -25,7 +25,7 @@ void player_spawn(Player* self, Vector at) {
}
void player_collision_solver(Player* self, List* contacts) {
- default_contact_solver(Player_as_PhysicsEntity(self), contacts);
+ physics_entity_solve_contacts(Player_as_PhysicsEntity(self), contacts);
}
void player_start(Player* self) {
diff --git a/src/tilemap.c b/src/tilemap.c
index d9af19a..7721d9e 100644
--- a/src/tilemap.c
+++ b/src/tilemap.c
@@ -147,4 +147,5 @@ float* tile_instance_get_rotation(TileInstance* self) {
return &self->transform.rotation;
}
-impl_PhysicsEntity_default_solver(tile_instance_solve_contacts, TileInstance)
+
+void tile_instance_solve_contacts(TileInstance* self, List* contacts) {}