X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_walk.h;h=a03e9a721d190fe6903849c8f764a9890457b6dc;hb=df9f72d2912a5424d37dfdb02f76aba8f1ed4df1;hp=989384c1fc9661cffe259296ef71952d47ce6c2b;hpb=872ad3e040f22df357929d3778a955ae8c4ac52b;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_walk.h b/player_walk.h
index 989384c..a03e9a7 100644
--- a/player_walk.h
+++ b/player_walk.h
@@ -1,13 +1,16 @@
 #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,
@@ -32,28 +35,41 @@ struct player_walk{
          k_walk_outro_regular
       }
       outro_type;
-
-      struct skeleton_anim *outro_anim;
       double outro_start_time;
+
+      int jump_queued;
+      f64 jump_input_time;
+
+      f32 walk_timer;
+      int step_phase;
    }
-   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;
 
-   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;
 
-   int step_phase;
-};
+      v3f foot_anchor;
+      enum walk_outro outro_type;
+      f32 outro_t,
+          commit_t;
+   }
+   animator;
+}
+static player_walk;
 
-VG_STATIC float
+static f32
    k_walkspeed             = 10.0f,
    k_airspeed              = 1.2f,
    k_stopspeed             = 4.0f,
@@ -62,8 +78,7 @@ VG_STATIC float
    k_walk_friction         = 10.0f,
    k_walk_step_height      = 0.2f;
 
-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_stopspeed,      flags=VG_VAR_CHEAT );
    VG_VAR_F32( k_airspeed,       flags=VG_VAR_CHEAT );
@@ -72,17 +87,35 @@ VG_STATIC void player__walk_register(void)
    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_transition  (void);
+static void player__walk_reset       (ent_spawn *rp );
+static void player__walk_restore     (void);
+static void player__walk_animator_exchange( bitpack_ctx *ctx, void *data );
+
+struct player_subsystem_interface static player_subsystem_walk = {
+   .system_register = player__walk_register,
+   .bind = player__walk_bind,
+   .reset = player__walk_reset,
+   .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 */