projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MENY
[carveJwlIkooP6JGAAIwe30JlM.git]
/
player_animation.h
diff --git
a/player_animation.h
b/player_animation.h
index ea7d566468bbc3463c750c8ef67249b1aeaafcbc..9f0c0d536e832c7d39c8927d4589ec12c3685b6d 100644
(file)
--- a/
player_animation.h
+++ b/
player_animation.h
@@
-139,8
+139,8
@@
static void player_animate(void)
offset[1] *= -0.3f;
offset[2] *= 0.01f;
offset[1] *= -0.3f;
offset[2] *= 0.01f;
- offset[0]
= vg_clampf( offset[0], -0.8f, 0.8f
);
- offset[1]
= vg_clampf( offset[1], -0.5f, 0.0f
);
+ offset[0]
=vg_clampf(offset[0],-0.8f,0.8f)*(1.0f-fabsf(player.fslide)*0.9f
);
+ offset[1]
=vg_clampf(offset[1],-0.5f,0.0f
);
/*
* Animation blending
/*
* Animation blending
@@
-245,7
+245,7
@@
static void player_animate(void)
skeleton_lerp_pose( sk, ground_pose, air_pose, player.ffly, apose );
skeleton_lerp_pose( sk, ground_pose, air_pose, player.ffly, apose );
- float add_grab_mod = 1.0f - player.ffly*phys->grab;
+ float add_grab_mod = 1.0f - player.ffly
;//
*phys->grab;
/* additive effects */
{
/* additive effects */
{