ulysse
/
2D_Engine_C
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ulysse:3060f2910c3a54d2b3ffb9429943eeb37bd30f27
Branches Tags
ulysse:main
..
compare: ulysse:d214571ef9187cb65de0224c0b3f063203f60dd0
Branches Tags
ulysse:main

No commits in common. "3060f2910c3a54d2b3ffb9429943eeb37bd30f27" and "d214571ef9187cb65de0224c0b3f063203f60dd0" have entirely different histories.
3060f2910c ... d214571ef9

2 changed files with 9 additions and 9 deletions
Show Stats Expand all files Collapse all files

16
src/ecs/components/animation_system.c
View File

@ -42,14 +42,14 @@ void animation_system_update(component_t *component)
system_data->actual_frame = system_data->actual_frame->prev; system_data->actual_frame = system_data->actual_frame->prev;
system_data->actual_frame_nb--; system_data->actual_frame_nb--;
} }
else if(system_data->loop) else if(!system_data->loop)
{ {
system_data->actual_frame = system_data->frames.last; system_data->play = false;
system_data->actual_frame_nb = system_data->frames.size - 1;
} }
else else
{ {
system_data->play = false; system_data->actual_frame = system_data->frames.last;
system_data->actual_frame_nb = system_data->frames.size - 1;
} }
} }
else else
@ -59,14 +59,14 @@ void animation_system_update(component_t *component)
system_data->actual_frame = system_data->actual_frame->next; system_data->actual_frame = system_data->actual_frame->next;
system_data->actual_frame_nb++; system_data->actual_frame_nb++;
} }
else if(system_data->loop) else if(!system_data->loop)
{ {
system_data->actual_frame = system_data->frames.first; system_data->play = false;
system_data->actual_frame_nb = 0;
} }
else else
{ {
system_data->play = false; system_data->actual_frame = system_data->frames.first;
system_data->actual_frame_nb = 0;
} }
} }
} }

2
src/ecs/components/headers/player_system.h
View File

@ -7,7 +7,7 @@
#include "animation_system.h" #include "animation_system.h"
#define PLAYER_DEFAULT_SPEED 80.0f // px / s #define PLAYER_DEFAULT_SPEED 80.0f // px / s
#define PLAYER_DEFAULT_IDLE_ANIMATION_SPEED 500.0f // ms / frame #define PLAYER_DEFAULT_IDLE_ANIMATION_SPEED 250.0f // ms / frame
#define PLAYER_DEFAULT_WALK_ANIMATION_SPEED 160.0f // ms / frame #define PLAYER_DEFAULT_WALK_ANIMATION_SPEED 160.0f // ms / frame
typedef enum player_state_t { typedef enum player_state_t {