breakup walk system and add new exit animation

[carveJwlIkooP6JGAAIwe30JlM.git] / player_walk.h

diff --git a/player_walk.h b/player_walk.h
index 368e99ce6f7b9cbfba908a1c2cdaf81b59412146..2e5101c774d767e16552b23ce3079d7c2ee2f91f 100644 (file)
--- a/player_walk.h
+++ b/player_walk.h
@@ -13,7 +13,6 @@ struct player_walk{
    struct player_walk_state{
       v3f prev_pos;
       v3f drop_in_target,
-          drop_in_foot_anchor,
           drop_in_start,
           drop_in_normal;
 
@@ -23,28 +22,26 @@ struct player_walk{
       enum walk_activity{
          k_walk_activity_air,
          k_walk_activity_ground,
-         k_walk_activity_sleep,
-         k_walk_activity_lockedmove,
          k_walk_activity_sit,
-         k_walk_activity_sit_up
+         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,
-         k_walk_outro_max
-      }
-      outro_type;
-      double outro_start_time;
+      f32 transition_t;
 
       int jump_queued;
       f64 jump_input_time;
 
       f32 walk_timer;
-      f32 sit_t;
       int step_phase;
    }
    state;
@@ -54,7 +51,7 @@ struct player_walk{
    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_sit;
+                        *anim_sit, *anim_popoff;
 
    struct player_walk_animator {
       v3f root_co;
@@ -63,13 +60,10 @@ struct player_walk{
           run,
           walk;
 
-      f32 walk_timer, yaw, pitch;
+      f32 walk_timer, yaw, pitch, board_yaw;
 
-      v3f foot_anchor;
-      enum walk_outro outro_type;
-      f32 outro_t,
-          commit_t,
-          sit_t;
+      enum walk_activity activity;
+      f32 transition_t;
    }
    animator;
 }
@@ -80,7 +74,7 @@ enum player_walk_soundeffect {
 };
 
 static f32
-   k_walkspeed             = 3.0f,
+   k_walkspeed             = 4.4f,
    k_runspeed              = 10.0f,
    k_airspeed              = 1.2f,
    k_stopspeed             = 4.0f,
@@ -110,10 +104,11 @@ 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       (void);
 static void player__walk_restore     (void);
 static void player__walk_animator_exchange( bitpack_ctx *ctx, void *data );
+static void player__walk_transition( enum walk_activity activity, 
+                                     f32 board_yaw );
 
 struct player_subsystem_interface static player_subsystem_walk = {
    .system_register = player__walk_register,