YourWishes/dusk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed animation

Browse Source
This commit is contained in:
Dominic Masters
2025-11-09 18:50:02 -06:00
parent 943e775364
commit d054cf9e36
6 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/rpg/entity/entity.c
View File

@@ -39,8 +39,11 @@ void entityUpdate(entity_t *entity) {
// What state is the entity in?
if(entity->animation != ENTITY_ANIM_IDLE) {
// Entity is mid animation, tick it (down).
entity->animFrame--;
if(entity->animFrame == 0) entity->animation = ENTITY_ANIM_IDLE;
entity->animTime -= TIME.delta;
if(entity->animTime <= 0) {
entity->animation = ENTITY_ANIM_IDLE;
entity->animTime = 0;
}
return;
}
@@ -56,7 +59,7 @@ void entityUpdate(entity_t *entity) {
void entityTurn(entity_t *entity, const entitydir_t direction) {
entity->direction = direction;
entity->animation = ENTITY_ANIM_TURN;
entity->animFrame = ENTITY_ANIM_TURN_DURATION;
entity->animTime = ENTITY_ANIM_TURN_DURATION;
}
void entityWalk(entity_t *entity, const entitydir_t direction) {
@@ -99,7 +102,7 @@ void entityWalk(entity_t *entity, const entitydir_t direction) {
entity->position.y = newY;
entity->animation = ENTITY_ANIM_WALK;
entity->animFrame = ENTITY_ANIM_WALK_DURATION;// TODO: Running vs walking
entity->animTime = ENTITY_ANIM_WALK_DURATION;// TODO: Running vs walking
}
entity_t * entityGetAt(const worldpos_t position) {

2
src/rpg/entity/entity.h
View File

@@ -25,7 +25,7 @@ typedef struct entity_s {
worldpos_t position;
entityanim_t animation;
uint8_t animFrame;
float_t animTime;
} entity_t;
extern entity_t ENTITIES[ENTITY_COUNT];

4
src/rpg/entity/entityanim.h
View File

@@ -8,8 +8,8 @@
#pragma once
#include "dusk.h"
#define ENTITY_ANIM_TURN_DURATION 6
#define ENTITY_ANIM_WALK_DURATION 10
#define ENTITY_ANIM_TURN_DURATION 0.06f
#define ENTITY_ANIM_WALK_DURATION 0.1f
typedef enum {
ENTITY_ANIM_IDLE,