This commit is contained in:
jshipsey 2020-10-10 22:16:37 -04:00 committed by Sam
parent 6a744eed82
commit 6f3f6996a6
2 changed files with 3 additions and 2 deletions
voxygen/src/anim/src/character

View File

@ -49,7 +49,7 @@ impl Animation for BeamAnimation {
next.r_hand.orientation = Quaternion::rotation_x(1.57) * Quaternion::rotation_y(0.2); next.r_hand.orientation = Quaternion::rotation_x(1.57) * Quaternion::rotation_y(0.2);
next.r_hand.scale = Vec3::one() * 1.05; next.r_hand.scale = Vec3::one() * 1.05;
next.main.position = Vec3::new(0.0, 0.0, 13.2); next.main.position = Vec3::new(0.0, 0.0, 13.2);
next.main.orientation = Quaternion::rotation_y(3.14); next.main.orientation = Quaternion::rotation_y(PI);
next.control.position = Vec3::new(-4.0, 7.0, 4.0); next.control.position = Vec3::new(-4.0, 7.0, 4.0);
next.control.orientation = Quaternion::rotation_x(-0.3) next.control.orientation = Quaternion::rotation_x(-0.3)

View File

@ -6,6 +6,7 @@ use common::{
comp::item::{Hands, ToolKind}, comp::item::{Hands, ToolKind},
states::utils::StageSection, states::utils::StageSection,
}; };
use std::f32::consts::PI;
pub struct Input { pub struct Input {
pub attack: bool, pub attack: bool,
@ -48,7 +49,7 @@ impl Animation for ShockwaveAnimation {
next.r_hand.orientation = Quaternion::rotation_x(1.57) * Quaternion::rotation_y(0.2); next.r_hand.orientation = Quaternion::rotation_x(1.57) * Quaternion::rotation_y(0.2);
next.r_hand.scale = Vec3::one() * 1.05; next.r_hand.scale = Vec3::one() * 1.05;
next.main.position = Vec3::new(0.0, 0.0, 13.2); next.main.position = Vec3::new(0.0, 0.0, 13.2);
next.main.orientation = Quaternion::rotation_y(3.14); next.main.orientation = Quaternion::rotation_y(PI);
next.control.position = Vec3::new(-4.0, 7.0, 4.0); next.control.position = Vec3::new(-4.0, 7.0, 4.0);
next.control.orientation = Quaternion::rotation_x(-0.3) next.control.orientation = Quaternion::rotation_x(-0.3)