X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fplayer.c;h=7e1a1a7717f4b1e6d4d4d39f733f4d0aa86b03b8;hb=5af75a0cd35d57d9de638d886f826ac4764c8697;hp=6cc5e6e1e298e382bf5781a31a711a10773be29f;hpb=f95aa52ec232fb5d301d5ae3b883098578e9e1de;p=nothing.git

diff --git a/src/player.c b/src/player.c
index 6cc5e6e1..7e1a1a77 100644
--- a/src/player.c
+++ b/src/player.c
@@ -22,6 +22,41 @@ struct player_t {
     float width;
 };
 
+static const vec_t opposing_rect_side_forces[RECT_SIDE_N] = {
+    { .x = 1.0f,  .y =  0.0f  },  /* RECT_SIDE_LEFT = 0, */
+    { .x = -1.0f, .y =  0.0f  },  /* RECT_SIDE_RIGHT, */
+    { .x = 0.0f,  .y =  1.0f, },  /* RECT_SIDE_TOP, */
+    { .x = 0.0f,  .y = -1.0f, }   /* RECT_SIDE_BOTTOM, */
+};
+
+static vec_t opposing_force_by_sides(int sides[RECT_SIDE_N])
+{
+    vec_t opposing_force = {
+        .x = 0.0f,
+        .y = 0.0f
+    };
+
+    for (rect_side_t side = 0; side < RECT_SIDE_N; ++side) {
+        if (sides[side]) {
+            vec_add(
+                &opposing_force,
+                opposing_rect_side_forces[side]);
+        }
+    }
+
+    return opposing_force;
+}
+
+static int squishing_horizontal_force(int sides[RECT_SIDE_N])
+{
+    return sides[RECT_SIDE_LEFT] && sides[RECT_SIDE_RIGHT];
+}
+
+static int squishing_vertical_force(int sides[RECT_SIDE_N])
+{
+    return sides[RECT_SIDE_TOP] && sides[RECT_SIDE_BOTTOM];
+}
+
 player_t *create_player(float x, float y)
 {
     player_t *player = malloc(sizeof(player_t));
@@ -98,16 +133,22 @@ void update_player(player_t *player,
     player->position.y = fmodf(player->position.y, 800.0f);
 
     player->height = fminf(player->height + PLAYER_INFLATION * d, PLAYER_HEIGHT);
+    player->width = (PLAYER_WIDTH * PLAYER_HEIGHT) / player->height;
+
+
+    int sides[RECT_SIDE_N] = { 0, 0, 0, 0 };
 
-    vec_t opposing_force = platforms_rect_object_collide(
-        platforms,
-        player_hitbox(player));
+    platforms_rect_object_collide(platforms, player_hitbox(player), sides);
+    vec_t opposing_force = opposing_force_by_sides(sides);
 
     if (opposing_force.y < 0.0f && (player->velocity.y + player->movement.y) > 800.0f) {
         player->height = PLAYER_HEIGHT / 2;
     }
 
-    for (int i = 0; i < 1000 && vec_length(opposing_force) > 1e-6; ++i) {
+    for (int i = 0; i < 1000
+                    && (vec_length(opposing_force) > 1e-6
+                        || squishing_vertical_force(sides)
+                        || squishing_horizontal_force(sides)); ++i) {
         player->position = vec_sum(
             player->position,
             vec_scala_mult(
@@ -124,9 +165,21 @@ void update_player(player_t *player,
             player->movement.y = 0.0f;
         }
 
-        opposing_force = platforms_rect_object_collide(
+        if (squishing_vertical_force(sides)) {
+            player->height -= 1e-2f;
+            /* player->width = (PLAYER_WIDTH * PLAYER_HEIGHT) / player->height; */
+        }
+
+        if (squishing_horizontal_force(sides)) {
+           player->width -= 1e-2f;
+           /* player->height = (PLAYER_WIDTH * PLAYER_HEIGHT) / player->width; */
+        }
+
+        platforms_rect_object_collide(
             platforms,
-            player_hitbox(player));
+            player_hitbox(player),
+            sides);
+        opposing_force = opposing_force_by_sides(sides);
     }
 }
 
@@ -167,9 +220,5 @@ void player_focus_camera(player_t *player,
     assert(player);
     assert(camera);
 
-    camera_center_at(
-        camera,
-        vec_sum(
-            player->position,
-            vec(player->width * 0.5f, player->height * 0.5f)));
+    camera_center_at(camera, player->position);
 }