zoriya/Gamacon
1
0
Fork 0
mirror of https://github.com/zoriya/Gamacon.git synced 2026-06-05 04:39:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from AnonymusRaccoon/beta

Browse Source 
Making jump work
This commit is contained in:
Anonymus Raccoon
2020-01-04 21:25:06 +01:00
committed by GitHub
parent a15371fed1 4e1c5d7bd5
commit b5b64a2f82
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systems/movable_system.c
+16 -6
View File
@@ -19,6 +19,16 @@
#include "components/controllable_component.h" #include "components/controllable_component.h"
void clamp_vel(struct movable_component *mov, struct collision_component *col)
{
if ((col->distance_left == 0 && mov->velocity.x < 0) ||
(col->distance_right == 0 && mov->velocity.x > 0))
mov->velocity.x = 0;
if ((col->distance_down == 0 && mov->velocity.y < 0) ||
(col->distance_top == 0 && mov->velocity.y > 0))
mov->velocity.y = 0;
}
static void update_entity(gc_engine *engine __attribute__((unused)), \ static void update_entity(gc_engine *engine __attribute__((unused)), \
void *system __attribute__((unused)), gc_entity *entity, float dtime) void *system __attribute__((unused)), gc_entity *entity, float dtime)
{ {
@@ -26,21 +36,21 @@ void *system __attribute__((unused)), gc_entity *entity, float dtime)
struct transform_component *pos = GETCMP(transform_component); struct transform_component *pos = GETCMP(transform_component);
struct collision_component *col = GETCMP(collision_component); struct collision_component *col = GETCMP(collision_component);
if (entity->id == 25)
printf("Velocity before: %4.0f\n", mov->velocity.y);
if (mov->velocity.x < 0) if (mov->velocity.x < 0)
pos->position.x -= MIN(mov->velocity.x * -dtime, col->distance_left); pos->position.x -= MIN(mov->velocity.x * -dtime, col->distance_left);
else else
pos->position.x += MIN(mov->velocity.x * dtime, col->distance_right); pos->position.x += MIN(mov->velocity.x * dtime, col->distance_right);
if (mov->velocity.y < 0) if (mov->velocity.y < 0)
pos->position.y -= MIN(mov->velocity.y * -dtime, col->distance_down); pos->position.y -= MIN(mov->velocity.y * -dtime, col->distance_down);
else { else
pos->position.y += MIN(mov->velocity.y * dtime, col->distance_top); pos->position.y += MIN(mov->velocity.y * dtime, col->distance_top);
}
if (col->distance_left == 0 || col->distance_right == 0)
mov->velocity.x = 0;
if (col->distance_down == 0 || col->distance_top == 0)
mov->velocity.y = 0;
mov->velocity.x += mov->acceleration.x * dtime; mov->velocity.x += mov->acceleration.x * dtime;
mov->velocity.y += mov->acceleration.y * dtime; mov->velocity.y += mov->acceleration.y * dtime;
clamp_vel(mov, col);
if (entity->id == 25)
printf("Acceleration: %4.0f, Velocity: %4.0f\n", mov->acceleration.y, mov->velocity.y);
mov->acceleration.x = 0; mov->acceleration.x = 0;
mov->acceleration.y = 0; mov->acceleration.y = 0;
} }