Archive/engine-psx
0
0
Fork 0
mirror of https://github.com/luksamuk/engine-psx.git synced 2025-04-28 13:28:02 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Knuckles sliding

Browse source
This commit is contained in:
Lucas S. Vieira 2025-04-10 00:04:59 -03:00
parent 5264899071
commit e222916636
3 changed files with 39 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
include/player.h
View file

@ -40,9 +40,13 @@ typedef enum {
ACTION_SPRING, ACTION_SPRING,
ACTION_HURT, ACTION_HURT,
ACTION_GASP, ACTION_GASP,
// Miles actions
ACTION_FLY, ACTION_FLY,
// Knuckles actions
ACTION_GLIDE, ACTION_GLIDE,
ACTION_DROP, ACTION_DROP,
ACTION_CLIMB,
ACTION_CLIMBUP,
} PlayerAction; } PlayerAction;
// Alias to make things look less weird // Alias to make things look less weird
@ -90,6 +94,7 @@ typedef struct {
uint8_t underwater; uint8_t underwater;
uint16_t remaining_air_frames; uint16_t remaining_air_frames;
int8_t glide_turn_dir; int8_t glide_turn_dir;
uint8_t sliding;
// Collision modes // Collision modes
CollMode gsmode; CollMode gsmode;

1
include/player_constants.h
View file

@ -10,6 +10,7 @@
#define KNUX_GLIDE_X_TOPSPD 0x00018000 #define KNUX_GLIDE_X_TOPSPD 0x00018000
#define KNUX_GLIDE_GRAVITY 0x00000200 // May be added or subtracted #define KNUX_GLIDE_GRAVITY 0x00000200 // May be added or subtracted
#define KNUX_GLIDE_TURN_STEP 0x00000020 // 20.12 scale for a range [0.5 -- 0] #define KNUX_GLIDE_TURN_STEP 0x00000020 // 20.12 scale for a range [0.5 -- 0]
#define KNUX_GLIDE_FRICTION 0x00000200
// Constants for running the game at a fixed 60 FPS. // Constants for running the game at a fixed 60 FPS.
// These constants are also in a 12-scale format for fixed point math. // These constants are also in a 12-scale format for fixed point math.

47
src/player.c
View file

@ -142,7 +142,7 @@ load_player(Player *player,
player->psmode = CDIR_FLOOR; player->psmode = CDIR_FLOOR;
player->remaining_air_frames = 1800; // 30 seconds player->remaining_air_frames = 1800; // 30 seconds
player->speedshoes_frames = -1; // Start inactive player->speedshoes_frames = -1; // Start inactive
player->glide_turn_dir = 0; player->glide_turn_dir = player->sliding = 0;
player_set_animation_direct(player, ANIM_STOPPED); player_set_animation_direct(player, ANIM_STOPPED);
player->anim_frame = player->anim_timer = 0; player->anim_frame = player->anim_timer = 0;
@ -652,7 +652,23 @@ _player_update_collision_tb(Player *player)
new_coord = player->ev_grnd2.coord; new_coord = player->ev_grnd2.coord;
player->pos.vy = ((new_coord - 16) << 12); player->pos.vy = ((new_coord - 16) << 12);
player->grnd = 1;
// When gliding, apply friction
player->sliding = 0;
if(player->action == ACTION_GLIDE) {
if(abs(player->vel.vx) <= KNUX_GLIDE_FRICTION)
player->vel.vx = 0;
else {
player->sliding = 1;
player->vel.vx -= KNUX_GLIDE_FRICTION * player->anim_dir;
player->vel.vy = 0;
}
}
// If the ground is hit while gliding, only set the ground flag
// to true if X speed is 0. Otherwise, always set to true
if(!((player->action == ACTION_GLIDE) && (player->vel.vx != 0)))
player->grnd = 1;
if(player->action == ACTION_JUMPING if(player->action == ACTION_JUMPING
|| player->action == ACTION_ROLLING || player->action == ACTION_ROLLING
@ -703,8 +719,6 @@ _player_update_collision_tb(Player *player)
} }
sound_play_vag(sfx_relea, 0); sound_play_vag(sfx_relea, 0);
camera.lag = 0x8000 >> 12; camera.lag = 0x8000 >> 12;
} else if(player->action == ACTION_GLIDE) {
// TODO: Slide
} else if(player->action == ACTION_DROP) { } else if(player->action == ACTION_DROP) {
player_set_action(player, ACTION_NONE); player_set_action(player, ACTION_NONE);
player->vel.vz = 0; player->vel.vz = 0;
@ -1037,14 +1051,16 @@ player_update(Player *player)
} }
// Turn to the other side // Turn to the other side
if(input_pressed(&player->input, PAD_LEFT) if(!player->sliding) {
&& ((player->vel.vx > ONE) || (player->vel.vx == 0))) { if(input_pressed(&player->input, PAD_LEFT)
player->vel.vz = player->vel.vx; && ((player->vel.vx > ONE) || (player->vel.vx == 0))) {
player->glide_turn_dir = -1; player->vel.vz = player->vel.vx;
} else if(input_pressed(&player->input, PAD_RIGHT) player->glide_turn_dir = -1;
&& ((player->vel.vx < -ONE) || (player->vel.vx == 0))) { } else if(input_pressed(&player->input, PAD_RIGHT)
player->vel.vz = player->vel.vx; && ((player->vel.vx < -ONE) || (player->vel.vx == 0))) {
player->glide_turn_dir = 1; player->vel.vz = player->vel.vx;
player->glide_turn_dir = 1;
}
} }
// When not turning... // When not turning...
@ -1282,7 +1298,9 @@ player_update(Player *player)
? ANIM_FLYUP ? ANIM_FLYUP
: ANIM_FLYDOWN)); : ANIM_FLYDOWN));
} else if(player->action == ACTION_GLIDE) { } else if(player->action == ACTION_GLIDE) {
if(player->glide_turn_dir == 0) { if(player->sliding) {
player_set_animation_direct(player, ANIM_GLIDELAND);
} else if(player->glide_turn_dir == 0) {
player_set_animation_direct(player, ANIM_GLIDE); player_set_animation_direct(player, ANIM_GLIDE);
} else { } else {
if(abs(player->vel.vx) >= (1 << 12)) if(abs(player->vel.vx) >= (1 << 12))
@ -1551,7 +1569,8 @@ void
player_draw(Player *player, VECTOR *pos) player_draw(Player *player, VECTOR *pos)
{ {
uint8_t is_rolling_angle = uint8_t is_rolling_angle =
(player_get_current_animation_hash(player) == ANIM_ROLLING); (player_get_current_animation_hash(player) == ANIM_ROLLING)
|| (player_get_current_animation_hash(player) == ANIM_GLIDELAND);
uint8_t is_rolling = uint8_t is_rolling =
is_rolling_angle is_rolling_angle
|| (player_get_current_animation_hash(player) == ANIM_SPINDASH); || (player_get_current_animation_hash(player) == ANIM_SPINDASH);