projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sitting down
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_walk.h
diff --git
a/player_walk.h
b/player_walk.h
index a03e9a721d190fe6903849c8f764a9890457b6dc..80cf5a9918e581f6c867768d85a709e1125f1af9 100644
(file)
--- a/
player_walk.h
+++ b/
player_walk.h
@@
-24,7
+24,9
@@
struct player_walk{
k_walk_activity_air,
k_walk_activity_ground,
k_walk_activity_sleep,
k_walk_activity_air,
k_walk_activity_ground,
k_walk_activity_sleep,
- k_walk_activity_lockedmove
+ k_walk_activity_lockedmove,
+ k_walk_activity_sit,
+ k_walk_activity_sit_up
}
activity;
}
activity;
@@
-41,6
+43,7
@@
struct player_walk{
f64 jump_input_time;
f32 walk_timer;
f64 jump_input_time;
f32 walk_timer;
+ f32 sit_t;
int step_phase;
}
state;
int step_phase;
}
state;
@@
-49,7
+52,8
@@
struct player_walk{
enum mdl_surface_prop surface;
struct skeleton_anim *anim_walk, *anim_run, *anim_idle, *anim_jump,
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;
struct player_walk_animator {
v3f root_co;
struct player_walk_animator {
v3f root_co;
@@
-58,12
+62,13
@@
struct player_walk{
run,
walk;
run,
walk;
- f32 walk_timer;
+ f32 walk_timer
, yaw, pitch
;
v3f foot_anchor;
enum walk_outro outro_type;
f32 outro_t,
v3f foot_anchor;
enum walk_outro outro_type;
f32 outro_t,
- commit_t;
+ commit_t,
+ sit_t;
}
animator;
}
}
animator;
}