#ifndef PLAYER_WALK_H
#define PLAYER_WALK_H
+#include "player.h"
#include "player_api.h"
+#include "rigidbody.h"
+
+#define PLAYER_JUMP_EPSILON 0.1 /* 100ms jump allowance */
struct player_walk{
rb_capsule collider;
- struct{
+ struct player_walk_state{
v3f prev_pos;
v3f drop_in_target,
- drop_in_foot_anchor,
drop_in_start,
drop_in_normal;
enum walk_activity{
k_walk_activity_air,
k_walk_activity_ground,
- k_walk_activity_sleep,
- k_walk_activity_immobile,
- k_walk_activity_lockedmove
+ k_walk_activity_sit,
+ k_walk_activity_sit_up,
+
+ /* transitions */
+ k_walk_activity_inone,
+ k_walk_activity_ipopoff,
+ k_walk_activity_oair,
+ k_walk_activity_odrop_in,
+ k_walk_activity_oregular,
+
+ k_walk_activity_max,
}
activity;
- enum walk_outro{
- k_walk_outro_none,
- k_walk_outro_jump_to_air,
- k_walk_outro_drop_in,
- k_walk_outro_regular
- }
- outro_type;
+ f32 transition_t;
- struct skeleton_anim *outro_anim;
- double outro_start_time;
+ int jump_queued;
+ f64 jump_input_time;
+
+ f32 walk_timer;
+ int step_phase;
+ v3f steer;
}
- state,
- state_gate_storage;
+ state;
+
+ f32 move_speed;
enum mdl_surface_prop surface;
struct skeleton_anim *anim_walk, *anim_run, *anim_idle, *anim_jump,
- *anim_jump_to_air, *anim_drop_in, *anim_intro;
+ *anim_jump_to_air, *anim_drop_in, *anim_intro,
+ *anim_sit, *anim_popoff;
- float blend_fly,
- blend_run,
- blend_walk,
+ struct player_walk_animator {
+ v3f root_co;
+ v4f root_q;
+ f32 fly,
+ run,
+ walk;
- move_speed,
- walk_timer;
+ f32 walk_timer, yaw, pitch, board_yaw;
- int step_phase;
+ enum walk_activity activity;
+ f32 transition_t;
+ }
+ animator;
+}
+static player_walk;
+
+enum player_walk_soundeffect {
+ k_player_walk_soundeffect_splash
};
-VG_STATIC float
- k_walkspeed = 10.0f,
+static f32
+ k_walkspeed = 4.4f,
+ k_runspeed = 10.0f,
k_airspeed = 1.2f,
k_stopspeed = 4.0f,
k_walk_accel = 10.0f,
k_walk_air_accel = 7.0f,
- k_walk_friction = 10.0f,
- k_walk_step_height = 0.2f;
+ k_walk_friction = 6.0f,
+ k_walk_step_height = 0.2f,
+
+ k_sit_yaw_limit = VG_PIf/1.7f,
+ k_sit_pitch_limit = VG_PIf/4.0f;
-VG_STATIC void player__walk_register(void)
-{
+static void player__walk_register(void){
VG_VAR_F32( k_walkspeed, flags=VG_VAR_CHEAT );
+ VG_VAR_F32( k_runspeed, flags=VG_VAR_CHEAT );
VG_VAR_F32( k_stopspeed, flags=VG_VAR_CHEAT );
VG_VAR_F32( k_airspeed, flags=VG_VAR_CHEAT );
VG_VAR_F32( k_walk_friction, flags=VG_VAR_CHEAT );
VG_VAR_F32( k_walk_accel, flags=VG_VAR_CHEAT );
}
-VG_STATIC void player__walk_pre_update ( player_instance *player );
-VG_STATIC void player__walk_update ( player_instance *player );
-VG_STATIC void player__walk_post_update ( player_instance *player );
-VG_STATIC void player__walk_animate ( player_instance *player,
- player_animation *anim );
-VG_STATIC void player__walk_post_animate( player_instance *player );
-VG_STATIC void player__walk_im_gui ( player_instance *player );
-VG_STATIC void player__walk_bind ( player_instance *player );
-VG_STATIC void player__walk_transition ( player_instance *player, v3f angles );
-VG_STATIC void player__walk_reset ( player_instance *player,
- ent_spawn *rp );
-VG_STATIC void player__walk_restore( player_instance *player );
+static void player__walk_pre_update (void);
+static void player__walk_update (void);
+static void player__walk_post_update (void);
+static void player__walk_animate (void);
+static void player__walk_pose (void *animator, player_pose *pose);
+static void player__walk_post_animate(void);
+static void player__walk_im_gui (void);
+static void player__walk_bind (void);
+static void player__walk_reset (void);
+static void player__walk_restore (void);
+static void player__walk_animator_exchange( bitpack_ctx *ctx, void *data );
+static void player__walk_transition( bool grounded, f32 board_yaw );
+
+struct player_subsystem_interface static player_subsystem_walk = {
+ .system_register = player__walk_register,
+ .bind = player__walk_bind,
+ .pre_update = player__walk_pre_update,
+ .update = player__walk_update,
+ .post_update = player__walk_post_update,
+ .im_gui = player__walk_im_gui,
+ .animate = player__walk_animate,
+ .post_animate = player__walk_post_animate,
+ .pose = player__walk_pose,
+ .network_animator_exchange = player__walk_animator_exchange,
+
+ .animator_data = &player_walk.animator,
+ .animator_size = sizeof(player_walk.animator),
+ .name = "Walk"
+};
#endif /* PLAYER_WALK_H */