Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

anim

Browse Source
This commit is contained in:
jshipsey 2021-05-26 00:04:15 -04:00
parent 0961f00c7c
commit ae43102a5b
1 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
voxygen/anim/src/character/repeater.rs
View File

@ -26,26 +26,28 @@ impl Animation for RepeaterAnimation {
#[allow(clippy::approx_constant)] // TODO: Pending review in #587
fn update_skeleton_inner<'a>(
skeleton: &Self::Skeleton,
(ability_info, hands, _velocity, _global_time, stage_section): Self::Dependency<'a>,
(ability_info, hands, velocity, _global_time, stage_section): Self::Dependency<'a>,
anim_time: f32,
rate: &mut f32,
s_a: &SkeletonAttr,
) -> Self::Skeleton {
*rate = 1.0;
let mut next = (*skeleton).clone();
let speed = Vec2::<f32>::from(velocity).magnitude();
let (move1, move2, move3, _move4) = match stage_section {
let (move1base, move2base, move3base, move4) = match stage_section {
Some(StageSection::Movement) => (anim_time, 0.0, 0.0, 0.0),
Some(StageSection::Buildup) => (1.0, anim_time, 0.0, 0.0),
Some(StageSection::Shoot) => (1.0, 1.0, anim_time, 0.0),
Some(StageSection::Recover) => (1.1, 1.0, 1.0, anim_time),
_ => (0.0, 0.0, 0.0, 0.0),
};
let pullback = 1.0 - move4;
let move1 = move1base * pullback;
let move2 = move2base * pullback;
let move3 = move3base * pullback;
// end spin stuff
fn fire(x: f32) -> f32 { (x * 18.0).sin() }
if let Some(ToolKind::Bow) = ability_info.and_then(|a| a.tool) {
next.hand_l.position = Vec3::new(s_a.bhl.0, s_a.bhl.1, s_a.bhl.2);
next.hand_l.orientation = Quaternion::rotation_x(s_a.bhl.3);
@ -54,49 +56,46 @@ impl Animation for RepeaterAnimation {
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_y(0.0) * Quaternion::rotation_z(0.0);
next.hold.position = Vec3::new(1.2, -1.0, -5.2);
next.hold.orientation = Quaternion::rotation_x(-1.7) * Quaternion::rotation_z(-0.1);
next.hold.scale = Vec3::one() * 1.0 * (1.0 - move3);
next.hold.position = Vec3::new(0.0, -1.0 + move3 * 2.0, -5.2);
next.hold.orientation = Quaternion::rotation_x(-1.57) * Quaternion::rotation_z(0.0);
next.hold.scale = Vec3::one() * (1.0);
if speed < 0.5 {
next.foot_l.position = Vec3::new(
-s_a.foot.0 + move1 * -0.75,
s_a.foot.1 + move1 * 4.0,
s_a.foot.2,
);
next.foot_l.orientation =
Quaternion::rotation_x(move1 * 0.2 + move2 * -0.1 + move3 * -0.2)
* Quaternion::rotation_z(move3 * 0.1);
next.foot_l.position = Vec3::new(
-s_a.foot.0 + move1 * -0.75 - 0.75,
s_a.foot.1 + move1 * 4.0 + 4.0,
s_a.foot.2 + move1 * 2.5 + 2.5,
);
next.foot_l.orientation = Quaternion::rotation_x(move1 * 0.6 + 0.6 + move2 * -0.2)
* Quaternion::rotation_z(move1 * 0.3 + 0.3);
next.foot_r.position = Vec3::new(
s_a.foot.0 + move1 * 0.75 + 0.75,
s_a.foot.1 + move1 * 4.0 + 4.0,
s_a.foot.2 + move1 * 2.5 + 2.5,
);
next.foot_r.orientation = Quaternion::rotation_x(move1 * 0.6 + 0.6 + move2 * -0.2)
* Quaternion::rotation_z(move1 * -0.3 - 0.3);
next.shorts.position =
Vec3::new(0.0, s_a.shorts.0 + move1 * 4.0, s_a.shorts.1 + move1 * 1.0);
next.shorts.orientation = Quaternion::rotation_x(move1 * 0.6);
next.belt.position = Vec3::new(0.0, s_a.belt.0 + move1 * 2.0, s_a.belt.1);
next.belt.orientation = Quaternion::rotation_x(move1 * 0.2);
next.foot_r.position = Vec3::new(s_a.foot.0 + move1 * 0.75, s_a.foot.1, s_a.foot.2);
next.foot_r.orientation =
Quaternion::rotation_x(move1 * 0.06 + move2 * -0.2 + move3 * -0.5)
* Quaternion::rotation_z(move1 * -0.6 + move3 * 0.8);
next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
next.chest.orientation = Quaternion::rotation_x(0.0);
} else {
};
next.shorts.position = Vec3::new(0.0, s_a.shorts.0 + move1 * 2.0, s_a.shorts.1);
next.shorts.orientation = Quaternion::rotation_x(move1 * 0.2 + move3 * 0.2);
next.belt.position = Vec3::new(0.0, s_a.belt.0 + move1 * 1.0, s_a.belt.1);
next.belt.orientation = Quaternion::rotation_x(move1 * 0.1 + move3 * 0.1);
next.control.position = Vec3::new(
s_a.bc.0 + move1 * 5.0,
s_a.bc.1 + move1 * 3.0,
s_a.bc.2 + move1 * 1.0,
s_a.bc.2 + move1 * 5.0,
);
next.control.orientation = Quaternion::rotation_x(s_a.bc.3 + move1 * 0.4)
* Quaternion::rotation_y(s_a.bc.4 + move1 * 0.8)
* Quaternion::rotation_z(s_a.bc.5);
next.head.orientation = Quaternion::rotation_y(move1 * 0.15 + move2 * 0.05);
next.torso.orientation =
Quaternion::rotation_x(move1 * 0.1 + move2 * 0.1 + move3 * 0.15);
next.head.orientation = Quaternion::rotation_x(move1 * 0.15)
* Quaternion::rotation_y(move1 * 0.15 + move2 * 0.05);
next.torso.orientation = Quaternion::rotation_x(move1 * 0.25 + move3 * -0.2);
next.hand_l.position = Vec3::new(
2.0 + fire(move3) * -6.0 - 3.0,
1.5 + fire(move3) * -6.0 - 3.0,
0.0,
);
next.hand_l.orientation = Quaternion::rotation_x(1.20)
* Quaternion::rotation_y(-0.6)
next.hand_l.position = Vec3::new(0.0, -2.5 + move3 * -6.0, 0.0);
next.hand_l.orientation = Quaternion::rotation_x(1.5)
* Quaternion::rotation_y(-0.0)
* Quaternion::rotation_z(-0.3);
}