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

setup for staff, more anim conversions

Browse Source
This commit is contained in:
jshipsey 2020-10-24 14:54:36 -04:00 committed by Robin Gilh
parent d4c2ebedf6
commit 021f7478f5
34 changed files with 194 additions and 490 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/voxygen/item_image_manifest.ron
View File

@ -491,32 +491,32 @@
// Staffs
Tool(Staff("BasicStaff")): VoxTrans(
"voxel.weapon.staff.firestaff_starter",
(1.0, 0.0, 0.0), (-310., 90.0, 0.0), 1.2,
(1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
),
Tool(Staff("BoneStaff")): VoxTrans(
"voxel.weapon.staff.firestaff_bone",
(1.0, 0.0, 0.0), (-310., 90.0, 0.0), 1.2,
(1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
),
Tool(Staff("AmethystStaff")): VoxTrans(
"voxel.weapon.staff.firestaff_amethyst",
(1.0, 0.0, 0.0), (-310., 90.0, 0.0), 1.2,
(1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
),
Tool(Staff("CultistStaff")): VoxTrans(
"voxel.weapon.staff.firestaff_cultist",
(1.0, 0.0, 0.0), (-310., 90.0, 0.0), 1.2,
(1.0, 0.0, 0.0), (-130., 90.0, 0.0), 1.2,
),
// Healing staff
Tool(Sceptre("Sceptre")): VoxTrans(
"voxel.weapon.sceptre.wood-nature",
(1.0, -1.0, 0.0), (-310., 90.0, 0.0), 1.2,
(1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2,
),
Tool(Sceptre("StarterSceptre")): VoxTrans(
"voxel.weapon.sceptre.wood-simple",
(0.0, -0.0, 0.0), (-310., 90.0, 0.0), 1.25,
(0.0, -0.0, 0.0), (-130., 90.0, 0.0), 1.25,
),
Tool(Sceptre("SceptreVelorite")): VoxTrans(
"voxel.weapon.sceptre.ore-nature",
(1.0, -1.0, 0.0), (-310., 90.0, 0.0), 1.15,
(1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.15,
),
// Shields
Tool(Shield("BasicShield")): VoxTrans(

BIN
assets/voxygen/voxel/weapon/sceptre/ore-nature.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/sceptre/wood-nature.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/sceptre/wood-simple.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/staff/firestaff_amethyst.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/staff/firestaff_bone.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/staff/firestaff_cultist.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/staff/firestaff_ogre.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/staff/firestaff_saurok.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/staff/firestaff_starter.vox
View File

Binary file not shown.

BIN
assets/voxygen/voxel/weapon/staff/wood-simple.vox
View File

Binary file not shown.

4
common/src/comp/inventory/item/tool.rs
View File

@ -267,8 +267,8 @@ impl Tool {
range: 3.5,
max_angle: 30.0,
charge_duration: Duration::from_millis(1200),
swing_duration: Duration::from_millis(400),
recover_duration: Duration::from_millis(100),
swing_duration: Duration::from_millis(200),
recover_duration: Duration::from_millis(300),
},
LeapMelee {
energy_cost: 700,

62
voxygen/src/anim/src/character/alpha.rs
View File

@ -38,9 +38,9 @@ impl Animation for AlphaAnimation {
let lab = 1.0;
let (movement1, movement2, movement3) = match stage_section {
Some(StageSection::Buildup) => (anim_time as f32, 0.0, 0.0),
Some(StageSection::Buildup) => ((anim_time as f32).powf(0.25), 0.0, 0.0),
Some(StageSection::Swing) => (1.0, anim_time as f32, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time as f32),
Some(StageSection::Recover) => (1.0, 1.0, (anim_time as f32).powf(4.0)),
_ => (0.0, 0.0, 0.0),
};
@ -56,10 +56,6 @@ impl Animation for AlphaAnimation {
/ (0.4 + 4.6 * ((anim_time as f32 * lab as f32 * 9.0).sin()).powf(2.0 as f32)))
.sqrt())
* ((anim_time as f32 * lab as f32 * 9.0).sin());
let quick = (((5.0)
/ (0.4 + 4.6 * ((anim_time as f32 * lab as f32 * 18.0).sin()).powf(2.0 as f32)))
.sqrt())
* ((anim_time as f32 * lab as f32 * 18.0).sin());
let axe = (((1.0)
/ (0.05 + 0.95 * ((anim_time as f32 * lab as f32 * 8.0).sin()).powf(2.0 as f32)))
.sqrt())
@ -74,7 +70,6 @@ impl Animation for AlphaAnimation {
* ((anim_time as f32 * lab as f32 * 4.0).sin());
match active_tool_kind {
//TODO: Inventory
Some(ToolKind::Sword(_)) => {
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_x(0.0);
@ -101,67 +96,16 @@ impl Animation for AlphaAnimation {
movement1 * 1.5 + (movement2 * 1.75).sin() * -3.0 + movement3 * 0.5,
);
next.head.position = Vec3::new(0.0, s_a.head.0 + 0.0, s_a.head.1);
next.head.position = Vec3::new(0.0 + movement2 * 2.0, s_a.head.0, s_a.head.1);
next.head.orientation = Quaternion::rotation_z(
movement1 * -0.9 + (movement2 * 1.75).sin() * 2.5 + movement3 * -0.5,
);
},
Some(ToolKind::Dagger(_)) => {
next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
next.head.orientation = Quaternion::rotation_z(slow * -0.25)
* Quaternion::rotation_x(0.0 + slow * 0.15)
* Quaternion::rotation_y(slow * -0.15);
next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
next.chest.orientation = Quaternion::rotation_z(slow * 0.4)
* Quaternion::rotation_x(0.0 + slow * -0.2)
* Quaternion::rotation_y(slow * 0.2);
next.belt.position = Vec3::new(0.0, s_a.belt.0, s_a.belt.1);
next.belt.orientation = next.chest.orientation * -0.3;
next.shorts.position = Vec3::new(0.0, s_a.shorts.0, s_a.shorts.1);
next.shorts.orientation = next.chest.orientation * -0.45;
next.hand_l.position = Vec3::new(0.0, 0.0, 0.0);
next.hand_l.orientation = Quaternion::rotation_x(0.0);
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_x(0.0);
next.control_l.position = Vec3::new(-10.0 + push * 5.0, 6.0 + push * 5.0, 2.0);
next.control_l.orientation = Quaternion::rotation_x(-1.4 + slow * 0.4)
* Quaternion::rotation_y(slow * -1.3)
* Quaternion::rotation_z(1.4 + slow * -0.5);
next.hand_r.position = Vec3::new(0.0, 0.0, 0.0);
next.hand_r.orientation = Quaternion::rotation_x(0.0);
next.hand_r.scale = Vec3::one() * 1.04;
next.second.position = Vec3::new(0.0, 0.0, 0.0);
next.second.orientation = Quaternion::rotation_x(0.0);
next.control_r.position = Vec3::new(8.0, 0.0, 0.0);
next.control_r.orientation = Quaternion::rotation_x(0.0);
next.foot_l.position =
Vec3::new(-s_a.foot.0, slow * -3.0 + quick * 3.0 - 4.0, s_a.foot.2);
next.foot_l.orientation = Quaternion::rotation_x(slow * 0.6)
* Quaternion::rotation_y((slow * -0.2).max(0.0));
next.foot_r.position =
Vec3::new(s_a.foot.0, slow * 3.0 + quick * -3.0 + 5.0, s_a.foot.2);
next.foot_r.orientation = Quaternion::rotation_x(slow * -0.6)
* Quaternion::rotation_y((slow * 0.2).min(0.0));
next.lantern.orientation =
Quaternion::rotation_x(slow * -0.7 + 0.4) * Quaternion::rotation_y(slow * 0.4);
next.torso.position = Vec3::new(0.0, 0.0, 0.1) * s_a.scaler;
next.torso.orientation = Quaternion::rotation_z(0.0)
* Quaternion::rotation_x(0.0)
* Quaternion::rotation_y(0.0);
next.torso.scale = Vec3::one() / 11.0 * s_a.scaler;
},
Some(ToolKind::Axe(_)) => {
next.head.position = Vec3::new(0.0, 0.0 + s_a.head.0, s_a.head.1);

50
voxygen/src/anim/src/character/beta.rs
View File

@ -34,9 +34,9 @@ impl Animation for BetaAnimation {
let mut next = (*skeleton).clone();
let (movement1, movement2, movement3) = match stage_section {
Some(StageSection::Buildup) => (anim_time as f32, 0.0, 0.0),
Some(StageSection::Cast) => (1.0, anim_time as f32, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time as f32),
Some(StageSection::Buildup) => ((anim_time as f32).powf(0.25), 0.0, 0.0),
Some(StageSection::Swing) => (1.0, anim_time as f32, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, (anim_time as f32).powf(4.0)),
_ => (0.0, 0.0, 0.0),
};
@ -53,41 +53,29 @@ impl Animation for BetaAnimation {
Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
next.control.position = Vec3::new(
s_a.sc.0
+ movement1 * -5.0
+ (movement2 as f32 * 2.5).sin() * 30.0
+ movement3 * -5.0,
s_a.sc.1 - (movement1 as f32 * 8.0).sin() * 0.8
+ movement1 * 2.0
+ movement3 * 2.0,
s_a.sc.2 - (movement1 as f32 * 8.0).sin() * 0.4,
s_a.sc.0 + (-1.4 + movement1 * -3.0 + movement2 * -2.0) * (1.0 - movement3),
s_a.sc.1 + (-1.4 + movement1 * 3.0 + movement2 * 3.0) * (1.0 - movement3),
s_a.sc.2 + (-1.9 + movement1 * 2.5 * (1.0 - movement3)),
);
next.control.orientation = Quaternion::rotation_x(-1.57 + s_a.sc.3)
* Quaternion::rotation_y(
s_a.sc.4 + movement1 * 1.5 + (movement2 as f32 * 2.5).sin() * 0.5,
)
* Quaternion::rotation_z(1.0 + s_a.sc.5 + (movement2 as f32 * 2.5).sin() * 1.0);
next.chest.orientation = Quaternion::rotation_y(-0.1)
next.control.orientation =
Quaternion::rotation_x(s_a.sc.3 + (-1.7) * (1.0 - movement3))
* Quaternion::rotation_y(
s_a.sc.4
+ (0.4 + movement1 * 1.5 + movement2 * -2.5) * (1.0 - movement3),
)
* Quaternion::rotation_z(
s_a.sc.5 + (1.67 + movement2 * 1.57) * (1.0 - movement3),
);
next.chest.orientation = Quaternion::rotation_x(0.15)
* Quaternion::rotation_y((-0.1) * (1.0 - movement3))
* Quaternion::rotation_z(
0.4 + movement1 * 1.5
+ (movement2 as f32 * 2.5).sin() * -0.5
+ movement3 * 1.0,
);
next.head.orientation = Quaternion::rotation_y(0.1)
* Quaternion::rotation_z(
-0.1 + movement1 * -1.1 + (movement2 as f32 * 2.5).sin() * -0.5,
(0.4 + movement1 * 1.5 + movement2 * -2.5) * (1.0 - movement3),
);
next.head.orientation = Quaternion::rotation_z((-0.4) * (1.0 - movement3));
},
_ => {},
}
next.glider.position = Vec3::new(0.0, 0.0, 10.0);
next.glider.scale = Vec3::one() * 0.0;
next.lantern.orientation = Quaternion::rotation_x(0.4);
next.lantern.scale = Vec3::one() * 0.65;
next.hold.scale = Vec3::one() * 0.0;
next.second.scale = match (
active_tool_kind.map(|tk| tk.hands()),
second_tool_kind.map(|tk| tk.hands()),

27
voxygen/src/anim/src/character/charge.rs
View File

@ -94,23 +94,24 @@ impl Animation for ChargeAnimation {
match active_tool_kind {
//TODO: Inventory
Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => {
next.hand_l.position = Vec3::new(11.0, 5.0, -4.0);
next.hand_l.orientation = Quaternion::rotation_x(1.27);
next.hand_r.position = Vec3::new(12.0, 5.5, 2.0);
next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2);
next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3);
next.hand_r.position = Vec3::new(s_a.sthr.0, s_a.sthr.1, s_a.sthr.2);
next.hand_r.orientation =
Quaternion::rotation_x(1.57) * Quaternion::rotation_y(0.2);
next.main.position = Vec3::new(12.0, 8.5, 13.2);
next.main.orientation = Quaternion::rotation_x(0.0)
* Quaternion::rotation_y(3.14)
* Quaternion::rotation_z(0.0);
Quaternion::rotation_x(s_a.sthr.3) * Quaternion::rotation_y(s_a.sthr.4);
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_y(0.0);
next.control.position = Vec3::new(
-7.0 + quick * 3.5 * (1.0 / (stopa + 0.1)),
0.0 + quicka * 3.5 * (1.0 / (stopa + 0.1)),
8.0 - stop * 3.0,
s_a.stc.0 + quick * 3.5 * (1.0 / (stopa + 0.1)),
s_a.stc.1,
s_a.stc.2 - stop * 3.0,
);
next.control.orientation =
Quaternion::rotation_x(stop * -0.2) * Quaternion::rotation_z(stop * 0.2);
next.control.orientation = Quaternion::rotation_x(s_a.stc.3 + stop * -0.2)
* Quaternion::rotation_y(s_a.stc.4)
* Quaternion::rotation_z(s_a.stc.5 + stop * 0.2);
},
Some(ToolKind::Bow(_)) => {
next.hand_l.position = Vec3::new(1.0, -2.0 + stop * -1.0, 0.0);

112
voxygen/src/anim/src/character/chargeswing.rs
View File

@ -44,7 +44,6 @@ impl Animation for ChargeswingAnimation {
// end spin stuff
let movement = anim_time as f32 * 1.0;
let fire = (anim_time as f32 * 18.0 * lab as f32).sin();
let foothoril = (anim_time as f32 * 8.0 * lab as f32 + PI * 1.45).sin();
let foothorir = (anim_time as f32 * 8.0 * lab as f32 + PI * (0.45)).sin();
@ -64,53 +63,60 @@ impl Animation for ChargeswingAnimation {
* ((anim_time as f32 * 8.0 * lab as f32 + PI * 0.4).sin()).powf(2.0 as f32)))
.sqrt())
* ((anim_time as f32 * 8.0 * lab as f32 + PI * 0.4).sin());
if let Some(ToolKind::Hammer(_)) = active_tool_kind {
next.hand_l.position = Vec3::new(-12.0, 0.0, 0.0);
next.hand_l.orientation = Quaternion::rotation_x(-0.0) * Quaternion::rotation_y(0.0);
next.hand_r.position = Vec3::new(2.0, 0.0, 0.0);
next.hand_r.orientation = Quaternion::rotation_x(0.0) * Quaternion::rotation_y(0.0);
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_y(-1.57) * Quaternion::rotation_z(1.57);
next.control.position = Vec3::new(6.0, 7.0, 1.0);
next.control.orientation = Quaternion::rotation_x(0.3)
* Quaternion::rotation_y(0.0)
* Quaternion::rotation_z(0.0);
let (movement1, movement2, movement3, tension) = match stage_section {
Some(StageSection::Charge) => (
(anim_time as f32).min(1.0),
0.0,
0.0,
(anim_time as f32 * 18.0 * lab as f32).sin(),
),
Some(StageSection::Swing) => (1.0, anim_time as f32, 0.0, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, (anim_time as f32).powf(4.0), 0.0),
_ => (0.0, 0.0, 0.0, 0.0),
};
if let Some(ToolKind::Hammer(_)) = active_tool_kind {
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_x(0.0);
next.hand_l.position = Vec3::new(
s_a.hhl.0,
s_a.hhl.1,
s_a.hhl.2 + (movement2 * -8.0) * (1.0 - movement3),
);
next.hand_l.orientation =
Quaternion::rotation_x(s_a.hhl.3) * Quaternion::rotation_y(s_a.hhl.4);
next.hand_r.position = Vec3::new(s_a.hhr.0, s_a.hhr.1, s_a.hhr.2);
next.hand_r.orientation =
Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
next.control.position = Vec3::new(
s_a.hc.0 + (movement1 * -2.0 + movement2 * -3.0) * (1.0 - movement3),
s_a.hc.1 + (movement1 * 2.0 + movement2 * 3.0) * (1.0 - movement3),
s_a.hc.2 + (movement1 * 2.0 + movement2 * 4.0) * (1.0 - movement3),
);
next.control.orientation = Quaternion::rotation_x(s_a.hc.3+(movement2*4.0)*(1.0-movement3))
* Quaternion::rotation_y(s_a.hc.4+(tension*0.08+movement1 * 0.7+movement2*-3.5)*(1.0-movement3))//+fire * 0.1
* Quaternion::rotation_z(s_a.hc.5+(movement1 * 0.2+movement2*-0.5)*(1.0-movement3));
next.chest.orientation = Quaternion::rotation_z(
short * 0.04 + (movement1 * 2.0 + movement2 * -2.5) * (1.0 - movement3),
);
next.belt.orientation =
Quaternion::rotation_z(short * 0.08 + (movement1 * -1.0) * (1.0 - movement3));
next.shorts.orientation =
Quaternion::rotation_z(short * 0.15 + (movement1 * -1.0) * (1.0 - movement3));
next.head.position = Vec3::new(
0.0 + (movement1 * -1.0 + movement2 * 2.0) * (1.0 - movement3),
s_a.head.0 + (movement1 * 1.0) * (1.0 - movement3),
s_a.head.1,
);
next.head.orientation =
Quaternion::rotation_z((movement1 * -1.5 + movement2 * 2.2) * (1.0 - movement3));
next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
if let Some(stage_section) = stage_section {
match stage_section {
StageSection::Charge => {
next.control.position = Vec3::new(
6.0 + (movement * -4.0).max(-8.0),
7.0 + (movement * 2.0).min(2.0),
1.0,
);
next.control.orientation = Quaternion::rotation_x(0.3)
* Quaternion::rotation_y(
0.0 + (movement * 0.7).min(0.7)
+ fire * 0.1 * (anim_time as f32).min(2.0),
)
* Quaternion::rotation_z(0.0 + (movement * 0.2).min(0.5));
next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
next.chest.orientation =
Quaternion::rotation_z((movement * 2.0).min(PI / 2.0));
next.belt.orientation =
Quaternion::rotation_z((short * 0.08 + movement * -1.0).max(-PI / 5.0));
next.shorts.orientation =
Quaternion::rotation_z((short * 0.15 + movement * -1.0).max(-PI / 4.0));
next.head.position = Vec3::new(
0.0,
s_a.head.0 - 2.0 + (movement * 2.0).min(2.0),
s_a.head.1,
);
next.head.orientation =
Quaternion::rotation_z((movement * -1.8).max(PI / -2.0));
next.belt.orientation = Quaternion::rotation_z(short * 0.05);
next.shorts.orientation = Quaternion::rotation_z(short * 0.15);
if speed > 0.5 {
/*if speed > 0.5 {
next.foot_l.position = Vec3::new(
-s_a.foot.0,
s_a.foot.1 + foothoril * -2.5 - 3.5,
@ -143,25 +149,7 @@ impl Animation for ChargeswingAnimation {
next.foot_r.orientation =
Quaternion::rotation_x(0.2) * Quaternion::rotation_z(0.5);
};
},
StageSection::Swing => {
next.chest.orientation = Quaternion::rotation_z(-0.5);
next.control.position = Vec3::new(6.0, 7.0, 1.0 + 3.0);
next.control.orientation = Quaternion::rotation_x(PI / 2.0)
* Quaternion::rotation_y(-1.6)
* Quaternion::rotation_z(0.3 - movement * 2.5);
next.head.orientation = Quaternion::rotation_z(0.8);
next.hand_l.position = Vec3::new(-3.0, 0.0, 0.0);
},
StageSection::Recover => {
next.chest.orientation = Quaternion::rotation_z(-0.5 + movement * 0.5);
next.control.position = Vec3::new(6.0, 7.0, 1.0 + 3.0 + movement * -3.0);
next.control.orientation = Quaternion::rotation_x(PI / 2.0)
* Quaternion::rotation_y(-1.6 + movement * 1.6)
* Quaternion::rotation_z(-2.2 + movement * 2.2);
next.head.orientation = Quaternion::rotation_z(0.8 + movement * -0.8);
next.hand_l.position = Vec3::new(-3.0 + movement * -9.0, 0.0, 0.0);
*/
},
_ => {},
}

47
voxygen/src/anim/src/character/climb.rs
View File

@ -97,40 +97,6 @@ impl Animation for ClimbAnimation {
);
next.hand_r.orientation = Quaternion::rotation_x(2.2 - quicka * 0.5);
match active_tool_kind {
Some(ToolKind::Dagger(_)) => {
next.main.position = Vec3::new(-4.0, -5.0, 7.0);
next.main.orientation =
Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(1.5 * PI);
},
Some(ToolKind::Shield(_)) => {
next.main.position = Vec3::new(-0.0, -5.0, 3.0);
next.main.orientation =
Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
},
_ => {
next.main.position = Vec3::new(-7.0, -5.0, 15.0);
next.main.orientation =
Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
},
}
match second_tool_kind {
Some(ToolKind::Dagger(_)) => {
next.second.position = Vec3::new(4.0, -6.0, 7.0);
next.second.orientation =
Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
},
Some(ToolKind::Shield(_)) => {
next.second.position = Vec3::new(0.0, -4.0, 3.0);
next.second.orientation =
Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(1.5 * PI);
},
_ => {
next.second.position = Vec3::new(-7.0, -5.0, 15.0);
next.second.orientation =
Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
},
}
next.foot_l.position =
Vec3::new(-s_a.foot.0, 5.0 + s_a.foot.1, s_a.foot.2 + quick * 2.5);
next.foot_l.orientation = Quaternion::rotation_x(0.2 - quicka * 0.5);
@ -143,16 +109,6 @@ impl Animation for ClimbAnimation {
next.shoulder_r.orientation = Quaternion::rotation_x(smooth * 0.15);
next.glider.position = Vec3::new(0.0, 0.0, 10.0);
next.glider.scale = Vec3::one() * 0.0;
next.main.position = Vec3::new(-7.0, -5.0, 18.0);
next.main.orientation =
Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57 + smootha * 0.25);
next.second.position = Vec3::new(0.0, 0.0, 0.0);
next.second.orientation = Quaternion::rotation_y(0.0);
next.lantern.orientation =
Quaternion::rotation_x(smooth * -0.3) * Quaternion::rotation_y(smooth * -0.3);
@ -211,9 +167,6 @@ impl Animation for ClimbAnimation {
next.glider.position = Vec3::new(0.0, 0.0, 10.0);
next.glider.scale = Vec3::one() * 0.0;
next.main.position = Vec3::new(-7.0, -5.0, 18.0);
next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
next.torso.position = Vec3::new(0.0, -0.2, 0.4) * s_a.scaler;
};

2
voxygen/src/anim/src/character/dance.rs
View File

@ -168,8 +168,6 @@ impl Animation for DanceAnimation {
next.control.position = Vec3::new(0.0, 0.0, 0.0);
next.control.orientation = Quaternion::rotation_x(0.0);
next.second.scale = match (
active_tool_kind.map(|tk| tk.hands()),
second_tool_kind.map(|tk| tk.hands()),

113
voxygen/src/anim/src/character/equip.rs
View File

@ -21,122 +21,45 @@ impl Animation for EquipAnimation {
(active_tool_kind, second_tool_kind, velocity, _global_time): Self::Dependency,
anim_time: f64,
rate: &mut f32,
s_a: &SkeletonAttr,
_s_a: &SkeletonAttr,
) -> Self::Skeleton {
*rate = 1.0;
let mut next = (*skeleton).clone();
let lab = 1.0;
let short = (((5.0)
/ (1.5 + 3.5 * ((anim_time as f32 * lab as f32 * 16.0).sin()).powf(2.0 as f32)))
.sqrt())
* ((anim_time as f32 * lab as f32 * 16.0).sin());
let equip_slow = 1.0 + (anim_time as f32 * 12.0 + PI).cos();
let equip_slowa = 1.0 + (anim_time as f32 * 12.0 + PI / 4.0).cos();
next.hand_l.orientation = Quaternion::rotation_x(0.0)
* Quaternion::rotation_y(-2.3)
* Quaternion::rotation_z(-1.57);
next.hand_r.orientation = Quaternion::rotation_x(0.0)
* Quaternion::rotation_y(-2.3)
* Quaternion::rotation_z(1.57);
next.control.position = Vec3::new(equip_slowa * -1.5, 0.0, equip_slow * 1.5);
match active_tool_kind {
Some(ToolKind::Sword(_)) => {
next.hand_l.position = Vec3::new(-0.75, -1.0, -2.5);
next.hand_l.orientation =
Quaternion::rotation_x(1.57) * Quaternion::rotation_y(-0.2);
next.hand_r.position = Vec3::new(0.75, -1.5, -5.5);
next.hand_r.orientation =
Quaternion::rotation_x(1.57) * Quaternion::rotation_y(0.3);
next.main.position = Vec3::new(0.0, 0.0, -6.0);
next.main.orientation = Quaternion::rotation_x(0.0)
* Quaternion::rotation_y(0.0)
* Quaternion::rotation_z(0.0);
next.control.position =
Vec3::new(-3.0 + equip_slowa * -1.5, -5.0, 12.0 + equip_slow * 1.5);
next.control.orientation =
Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
next.hand_l.position = Vec3::new(-8.0, -5.0, 17.0);
next.hand_r.position = Vec3::new(-6.0, -4.5, 14.0);
},
Some(ToolKind::Axe(_)) => {
next.hand_l.position = Vec3::new(-4.0, 3.0, 6.0);
next.hand_l.orientation = Quaternion::rotation_x(-0.3)
* Quaternion::rotation_z(3.14 - 0.3)
* Quaternion::rotation_y(-0.8);
next.hand_r.position = Vec3::new(-2.5, 9.0, 4.0);
next.hand_r.orientation = Quaternion::rotation_x(-0.3)
* Quaternion::rotation_z(3.14 - 0.3)
* Quaternion::rotation_y(-0.8);
next.main.position = Vec3::new(-6.0, 10.0, -1.0);
next.main.orientation = Quaternion::rotation_x(1.27)
* Quaternion::rotation_y(-0.3)
* Quaternion::rotation_z(-0.8);
next.control.position = Vec3::new(0.0, 0.0, 0.0);
next.control.orientation =
Quaternion::rotation_x(0.2) * Quaternion::rotation_y(-0.3);
next.hand_l.position = Vec3::new(-7.0, -5.0, 17.0);
next.hand_r.position = Vec3::new(-5.0, -4.5, 14.0);
},
Some(ToolKind::Hammer(_)) => {
next.hand_l.position = Vec3::new(-7.0, 5.5, 3.5);
next.hand_l.orientation =
Quaternion::rotation_x(0.0) * Quaternion::rotation_y(0.32);
next.hand_r.position = Vec3::new(8.0, 7.75, 0.0);
next.hand_r.orientation =
Quaternion::rotation_x(0.0) * Quaternion::rotation_y(0.22);
next.main.position = Vec3::new(6.0, 7.0, 0.0);
next.main.orientation =
Quaternion::rotation_y(-1.35) * Quaternion::rotation_z(1.57);
next.control.position =
Vec3::new(-3.0 + equip_slowa * -1.5, -12.0, 12.0 + equip_slow * 1.5);
next.control.orientation =
Quaternion::rotation_x(0.0) * Quaternion::rotation_y(1.35 + 2.5);
next.hand_l.position = Vec3::new(-5.0, -5.0, 13.0);
next.hand_r.position = Vec3::new(-3.0, -4.5, 10.0);
},
Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => {
next.hand_l.position = Vec3::new(0.0, 0.0, -4.0);
next.hand_l.orientation =
Quaternion::rotation_x(1.27) * Quaternion::rotation_y(0.0);
next.hand_r.position = Vec3::new(0.0, 0.0, 2.0);
next.hand_r.orientation =
Quaternion::rotation_x(1.57) * Quaternion::rotation_y(0.2);
next.main.position = Vec3::new(0.0, 0.0, 13.2);
next.main.orientation = Quaternion::rotation_y(3.14);
next.control.position = Vec3::new(-4.0, 7.0, 4.0);
next.control.orientation = Quaternion::rotation_x(-0.3)
* Quaternion::rotation_y(0.15)
* Quaternion::rotation_z(0.0);
next.hand_l.position = Vec3::new(-3.0, -5.0, 8.0);
next.hand_r.position = Vec3::new(-1.75, -4.5, 5.0);
},
Some(ToolKind::Bow(_)) => {
next.hand_l.position = Vec3::new(2.0, 1.5, 0.0);
next.hand_l.orientation = Quaternion::rotation_x(1.20)
* Quaternion::rotation_y(-0.6)
* Quaternion::rotation_z(-0.3);
next.hand_l.scale = Vec3::one() * 1.04;
next.hand_r.position = Vec3::new(5.9, 4.5, -5.0);
next.hand_r.orientation = Quaternion::rotation_x(1.20)
* Quaternion::rotation_y(-0.6)
* Quaternion::rotation_z(-0.3);
next.hand_r.scale = Vec3::one() * 1.04;
next.main.position = Vec3::new(3.0, 2.0, -13.0);
next.main.orientation = Quaternion::rotation_x(-0.3)
* Quaternion::rotation_y(0.3)
* Quaternion::rotation_z(-0.6);
next.control.position = Vec3::new(-7.0, 6.0, 6.0);
next.control.orientation = Quaternion::rotation_x(0.0)
* Quaternion::rotation_y(0.0)
* Quaternion::rotation_z(0.0);
next.hand_l.position = Vec3::new(-3.0, -5.0, 9.0);
next.hand_r.position = Vec3::new(-1.75, -4.5, 7.0);
},
_ => {},
}
next.hold.scale = Vec3::one() * 0.0;
if velocity > 0.5 {
next.torso.orientation = Quaternion::rotation_x(-0.2);
} else {
next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1 + short * 0.2);
next.foot_l.position = Vec3::new(-s_a.foot.0, s_a.foot.1, s_a.foot.2);
next.foot_l.orientation = Quaternion::rotation_x(0.0);
next.foot_r.position = Vec3::new(s_a.foot.0, s_a.foot.1, s_a.foot.2);
next.foot_r.orientation = Quaternion::rotation_x(0.0);
}
next.second.scale = match (
active_tool_kind.map(|tk| tk.hands()),

36
voxygen/src/anim/src/character/glidewield.rs
View File

@ -77,42 +77,6 @@ impl Animation for GlideWieldAnimation {
next.glider.orientation = Quaternion::rotation_x(0.35);
next.glider.position = Vec3::new(0.0, -9.0, 17.0);
next.glider.scale = Vec3::one() * 1.0;
match active_tool_kind {
Some(ToolKind::Dagger(_)) => {
next.main.position = Vec3::new(-4.0, -5.0, 7.0);
next.main.orientation =
Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(1.5 * PI);
},
Some(ToolKind::Shield(_)) => {
next.main.position = Vec3::new(-0.0, -5.0, 3.0);
next.main.orientation =
Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
},
_ => {
next.main.position = Vec3::new(-7.0, -5.0, 15.0);
next.main.orientation =
Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
},
}
match second_tool_kind {
Some(ToolKind::Dagger(_)) => {
next.second.position = Vec3::new(4.0, -6.0, 7.0);
next.second.orientation =
Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
},
Some(ToolKind::Shield(_)) => {
next.second.position = Vec3::new(0.0, -4.0, 3.0);
next.second.orientation =
Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(1.5 * PI);
},
_ => {
next.second.position = Vec3::new(-7.0, -5.0, 15.0);
next.second.orientation =
Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
},
}
}
next.second.scale = match (

21
voxygen/src/anim/src/character/gliding.rs
View File

@ -76,17 +76,13 @@ impl Animation for GlidingAnimation {
anim_time as f32
};
next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
next.head.orientation = Quaternion::rotation_x(0.35 - slow * 0.10 + head_look.y)
* Quaternion::rotation_z(head_look.x + slowa * 0.15);
next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1);
next.chest.orientation = Quaternion::rotation_z(slowa * 0.02);
next.belt.position = Vec3::new(0.0, 0.0, -2.0);
next.belt.orientation = Quaternion::rotation_z(slowa * 0.1 + tilt * tiltcancel * 12.0);
next.shorts.position = Vec3::new(0.0, s_a.shorts.0, s_a.shorts.1);
next.shorts.orientation = Quaternion::rotation_z(slowa * 0.12 + tilt * tiltcancel * 16.0);
next.hand_l.position = Vec3::new(-9.5, -3.0, 10.0);
@ -118,23 +114,6 @@ impl Animation for GlidingAnimation {
Quaternion::rotation_x(0.8) * Quaternion::rotation_y(slowa * 0.04);
next.glider.scale = Vec3::one();
match active_tool_kind {
Some(ToolKind::Dagger(_)) => {
next.main.position = Vec3::new(-4.0, -5.0, 7.0);
next.main.orientation =
Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(1.5 * PI);
},
Some(ToolKind::Shield(_)) => {
next.main.position = Vec3::new(-0.0, -5.0, 3.0);
next.main.orientation =
Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
},
_ => {
next.main.position = Vec3::new(-7.0, -5.0, 15.0);
next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
},
}
next.torso.position = Vec3::new(0.0, -4.0, 10.0) / 11.0 * s_a.scaler;
next.torso.orientation = Quaternion::rotation_x(-0.06 * speed.max(12.0) + slow * 0.04)
* Quaternion::rotation_y(tilt * tiltcancel * 32.0);

4
voxygen/src/anim/src/character/jump.rs
View File

@ -136,6 +136,10 @@ impl Animation for JumpAnimation {
next.main.orientation =
Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
},
Some(ToolKind::Staff(_)) => {
next.main.position = Vec3::new(2.0, -5.0, -1.0);
next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57);
},
_ => {
next.main.position = Vec3::new(-7.0, -5.0, 15.0);
next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);

15
voxygen/src/anim/src/character/mod.rs
View File

@ -136,6 +136,9 @@ pub struct SkeletonAttr {
hhl: (f32, f32, f32, f32, f32, f32),
hhr: (f32, f32, f32, f32, f32, f32),
hc: (f32, f32, f32, f32, f32, f32),
sthl: (f32, f32, f32, f32, f32, f32),
sthr: (f32, f32, f32, f32, f32, f32),
stc: (f32, f32, f32, f32, f32, f32),
}
impl Default for SkeletonAttr {
@ -158,6 +161,9 @@ impl Default for SkeletonAttr {
hhl: (0.0, 0.0, 10.0, 0.0, 0.0, 0.0),
hhr: (0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
hc: (0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
sthl: (0.0, 0.0, 10.0, 0.0, 0.0, 0.0),
sthr: (0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
stc: (0.0, 0.0, 0.0, 0.0, 0.0, 0.0),
}
}
}
@ -249,6 +255,15 @@ impl<'a> From<&'a Body> for SkeletonAttr {
hc: match (body.species, body.body_type) {
(_, _) => (6.0, 7.0, 1.0, -0.3, -1.57, 0.5),
},
sthl: match (body.species, body.body_type) {
(_, _) => (0.0, 0.0, 1.0, 1.27, 0.0, 0.0),
},
sthr: match (body.species, body.body_type) {
(_, _) => (0.0, 0.0, 7.0, 1.57, 0.2, 0.0),
},
stc: match (body.species, body.body_type) {
(_, _) => (-5.0, 5.0, -1.0, -0.3, 0.15, 0.0),
},
}
}
}

38
voxygen/src/anim/src/character/roll.rs
View File

@ -75,46 +75,8 @@ impl Animation for RollAnimation {
next.foot_r.position = Vec3::new(s_a.foot.0, s_a.foot.1 + 5.5, s_a.foot.2 - 5.0);
next.foot_r.orientation = Quaternion::rotation_x(0.9);
next.glider.position = Vec3::new(0.0, 0.0, 10.0);
match active_tool_kind {
Some(ToolKind::Dagger(_)) => {
next.main.position = Vec3::new(-4.0, -5.0, 7.0);
next.main.orientation =
Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(1.5 * PI);
},
Some(ToolKind::Shield(_)) => {
next.main.position = Vec3::new(-0.0, -5.0, 3.0);
next.main.orientation =
Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
},
_ => {
next.main.position = Vec3::new(-7.0, -5.0, 15.0);
next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
},
}
match second_tool_kind {
Some(ToolKind::Dagger(_)) => {
next.second.position = Vec3::new(4.0, -6.0, 7.0);
next.second.orientation =
Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
},
Some(ToolKind::Shield(_)) => {
next.second.position = Vec3::new(0.0, -4.0, 3.0);
next.second.orientation =
Quaternion::rotation_y(-0.25 * PI) * Quaternion::rotation_z(1.5 * PI);
},
_ => {
next.second.position = Vec3::new(-7.0, -5.0, 15.0);
next.second.orientation =
Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
},
}
next.lantern.orientation = Quaternion::rotation_x(0.1) * Quaternion::rotation_y(0.1);
next.lantern.scale = Vec3::one() * 0.65;
next.hold.scale = Vec3::one() * 0.0;
next.torso.position = Vec3::new(0.0, 0.0, 8.0) / 11.0 * s_a.scaler;
next.torso.orientation =

7
voxygen/src/anim/src/character/run.rs
View File

@ -197,9 +197,14 @@ impl Animation for RunAnimation {
next.main.orientation =
Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
},
Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => {
next.main.position = Vec3::new(2.0, -5.0, -1.0);
next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57);
},
_ => {
next.main.position = Vec3::new(-7.0, -5.0, 15.0);
next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);
next.main.orientation =
Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57 + shorte * -0.2);
},
}

26
voxygen/src/anim/src/character/shoot.rs
View File

@ -56,20 +56,22 @@ impl Animation for ShootAnimation {
next.shorts.orientation = next.chest.orientation * -0.08;
match active_tool_kind {
//TODO: Inventory
Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => {
next.hand_l.position = Vec3::new(11.0, 5.0, -4.0);
next.hand_l.orientation =
Quaternion::rotation_x(1.27) * Quaternion::rotation_y(0.0);
next.hand_r.position = Vec3::new(12.0, 5.5, 2.0);
next.hand_r.orientation =
Quaternion::rotation_x(1.57) * Quaternion::rotation_y(0.2);
next.main.position = Vec3::new(12.0, 8.5, 13.2);
next.main.orientation = Quaternion::rotation_y(3.14);
next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2);
next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3);
next.control.position = Vec3::new(-7.0, 6.0, 6.0 - exp * 5.0);
next.control.orientation =
Quaternion::rotation_x(exp * 1.3) * Quaternion::rotation_z(exp * 1.5);
next.hand_r.position = Vec3::new(s_a.sthr.0, s_a.sthr.1, s_a.sthr.2);
next.hand_r.orientation =
Quaternion::rotation_x(s_a.sthr.3) * Quaternion::rotation_y(s_a.sthr.4);
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_y(0.0);
next.control.position =
Vec3::new(s_a.stc.0, s_a.stc.1 + exp * 5.0, s_a.stc.2 - exp * 5.0);
next.control.orientation = Quaternion::rotation_x(s_a.stc.3 + exp * 0.4)
* Quaternion::rotation_y(s_a.stc.4)
* Quaternion::rotation_z(s_a.stc.5 + exp * 1.5);
},
Some(ToolKind::Bow(_)) => {
next.hand_l.position =

45
voxygen/src/anim/src/character/spin.rs
View File

@ -39,9 +39,9 @@ impl Animation for SpinAnimation {
let lab = 1.0;
let (movement1, movement2, movement3) = match stage_section {
Some(StageSection::Buildup) => (anim_time as f32, 0.0, 0.0),
Some(StageSection::Swing) => (1.0, anim_time as f32, 0.0),
Some(StageSection::Recover) => (1.0, 1.0, anim_time as f32),
Some(StageSection::Buildup) => ((anim_time as f32).powf(0.25), 0.0, 0.0),
Some(StageSection::Swing) => (1.0, (anim_time as f32).powf(1.8), 0.0),
Some(StageSection::Recover) => (1.0, 1.0, (anim_time as f32).powf(4.0)),
_ => (0.0, 0.0, 0.0),
};
@ -55,8 +55,6 @@ impl Animation for SpinAnimation {
let spin = (anim_time as f32 * 2.8 * lab as f32).sin();
let spinhalf = (anim_time as f32 * 1.4 * lab as f32).sin();
fn slow(x: f32) -> f32 { (x * 8.0).sin() }
next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1);
if let Some(ToolKind::Sword(_)) = active_tool_kind {
@ -71,32 +69,21 @@ impl Animation for SpinAnimation {
Quaternion::rotation_x(s_a.shr.3) * Quaternion::rotation_y(s_a.shr.4);
next.control.position = Vec3::new(
s_a.sc.0 + movement1 * 2.0 + movement2 * -8.0 + movement3 * -7.0,
s_a.sc.1
+ 8.0
+ slow(movement1) * 0.6
+ slow(movement2) * 3.0
+ slow(movement3) * -0.8
+ movement3 * -10.0,
s_a.sc.2
+ 1.0
+ slow(movement1) * 0.6
+ slow(movement2) * 3.5
+ movement2 * 3.0
+ slow(movement3) * -0.4
+ movement3 * -4.0,
s_a.sc.0 + movement1 * 2.0 + movement2 * -4.0 + movement3 * -7.0,
s_a.sc.1 + 8.0 + movement1 * 0.6 + movement3 * -10.0,
s_a.sc.2 + 1.0 + movement1 * 0.6 + movement2 * 1.5 + movement3 * -4.0,
);
next.control.orientation = Quaternion::rotation_x(
-0.5 + s_a.sc.4 + movement1 * -1.57 + movement2 * -0.6 + slow(movement2) * -0.25,
) * Quaternion::rotation_y(
s_a.sc.4 - 0.6 + movement1 * 2.0 + movement2 * -2.0,
) * Quaternion::rotation_z(
s_a.sc.5 + 0.1 + movement1 + movement2,
next.control.orientation = Quaternion::rotation_x(-0.5 + s_a.sc.3 + movement1 * -1.2)
* Quaternion::rotation_y(s_a.sc.4 - 0.6 + movement1 * 1.0)
* Quaternion::rotation_z(s_a.sc.5 + 0.1 + movement1 * 1.57);
next.head.position = Vec3::new(
0.0 + 2.0 + movement2 * -2.0,
2.0 + movement2 * -2.0 + s_a.head.0,
s_a.head.1,
);
next.head.orientation = Quaternion::rotation_z(movement2 * -0.4);
next.head.orientation = Quaternion::rotation_z(slow(movement2) * -0.8);
next.chest.orientation = Quaternion::rotation_x(slow(movement2) * 0.15)
next.chest.orientation = Quaternion::rotation_x(movement2 * 0.15)
* Quaternion::rotation_y(movement1 * -0.1 + movement2 * 0.3 + movement3 * -0.1)
* Quaternion::rotation_z(
-1.0 + movement1 * -0.6 + movement2 * 1.5 + movement3 * 0.5,
@ -111,7 +98,7 @@ impl Animation for SpinAnimation {
next.head.orientation = Quaternion::rotation_y(movement1 * 0.1 - movement2 * -0.1)
* Quaternion::rotation_z(1.07 + movement1 * 0.4 + movement2 * -1.5);
next.torso.orientation = Quaternion::rotation_z((movement2).sin() * 7.2);
next.torso.orientation = Quaternion::rotation_z(movement2 * 6.28);
}
if let Some(ToolKind::Axe(_) | ToolKind::Hammer(_) | ToolKind::Dagger(_)) = active_tool_kind

4
voxygen/src/anim/src/character/stand.rs
View File

@ -109,6 +109,10 @@ impl Animation for StandAnimation {
next.main.orientation =
Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
},
Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => {
next.main.position = Vec3::new(2.0, -5.0, -1.0);
next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57);
},
_ => {
next.main.position = Vec3::new(-7.0, -5.0, 15.0);
next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);

4
voxygen/src/anim/src/character/swim.rs
View File

@ -178,6 +178,10 @@ impl Animation for SwimAnimation {
next.main.orientation =
Quaternion::rotation_y(0.25 * PI) * Quaternion::rotation_z(-1.5 * PI);
},
Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => {
next.main.position = Vec3::new(2.0, -5.0, -1.0);
next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57);
},
_ => {
next.main.position = Vec3::new(-7.0, -5.0, 15.0);
next.main.orientation = Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57);

2
voxygen/src/anim/src/character/swimwield.rs
View File

@ -359,8 +359,6 @@ impl Animation for SwimWieldAnimation {
_ => {},
}
next.second.scale = match (
active_tool_kind.map(|tk| tk.hands()),
second_tool_kind.map(|tk| tk.hands()),

36
voxygen/src/anim/src/character/wield.rs
View File

@ -50,8 +50,8 @@ impl Animation for WieldAnimation {
let foothoril = (anim_time as f32 * 16.0 * lab as f32 + PI * 1.45).sin();
let slowalt = (anim_time as f32 * 6.0 + PI).cos();
let u_slow = (anim_time as f32 * 1.0 + PI).sin();
let slow = (anim_time as f32 * 3.0 + PI).sin();
let u_slow = (anim_time as f32 * 2.5 + PI).sin();
let slow = (anim_time as f32 * 5.0 + PI).sin();
let u_slowalt = (anim_time as f32 * 3.0 + PI).cos();
let short = (((5.0)
@ -182,37 +182,37 @@ impl Animation for WieldAnimation {
next.hand_r.orientation =
Quaternion::rotation_x(s_a.hhr.3) * Quaternion::rotation_y(s_a.hhr.4);
next.control.position = Vec3::new(s_a.hc.0, s_a.hc.1, s_a.hc.2);
next.control.position =
Vec3::new(s_a.hc.0, s_a.hc.1 + speed * 0.2, s_a.hc.2 + speed * 0.8);
next.control.orientation = Quaternion::rotation_x(s_a.hc.3 + u_slow * 0.15)
* Quaternion::rotation_y(s_a.hc.4)
* Quaternion::rotation_z(s_a.hc.5 + u_slowalt * 0.08);
* Quaternion::rotation_y(s_a.hc.4 + speed * -0.04)
* Quaternion::rotation_z(s_a.hc.5 + u_slowalt * 0.07);
},
Some(ToolKind::Staff(_)) | Some(ToolKind::Sceptre(_)) => {
if speed > 0.5 && velocity.z == 0.0 {
next.hand_r.position = Vec3::new(
4.0 + s_a.hand.0 + foothoril * 1.3,
-2.0 + s_a.hand.1 + foothoril * -6.5,
-2.0 + s_a.hand.2 - foothoril * 7.0,
s_a.hand.1 + foothoril * -6.5,
5.0 + s_a.hand.2 - foothoril * 7.0,
);
next.hand_r.orientation = Quaternion::rotation_x(0.6 + footrotl * -1.2)
* Quaternion::rotation_y(footrotl * -0.4);
} else {
next.hand_r.position = Vec3::new(0.0, 0.0, 2.0);
next.hand_r.position = Vec3::new(s_a.sthr.0, s_a.sthr.1, s_a.sthr.2);
next.hand_r.orientation =
Quaternion::rotation_x(1.57) * Quaternion::rotation_y(0.2);
Quaternion::rotation_x(s_a.sthr.3) * Quaternion::rotation_y(s_a.sthr.4);
};
next.control.position = Vec3::new(-4.0, 7.0, 4.0);
next.main.position = Vec3::new(0.0, 0.0, 0.0);
next.main.orientation = Quaternion::rotation_y(0.0);
next.hand_l.position = Vec3::new(0.0, 0.0, -4.0);
next.hand_l.orientation =
Quaternion::rotation_x(1.27) * Quaternion::rotation_y(0.0);
next.control.position = Vec3::new(s_a.stc.0, s_a.stc.1, s_a.stc.2);
next.main.position = Vec3::new(0.0, 0.0, 13.2);
next.main.orientation = Quaternion::rotation_y(3.14);
next.hand_l.position = Vec3::new(s_a.sthl.0, s_a.sthl.1, s_a.sthl.2);
next.hand_l.orientation = Quaternion::rotation_x(s_a.sthl.3);
next.control.orientation = Quaternion::rotation_x(-0.3 + u_slow * 0.1)
* Quaternion::rotation_y(0.15)
* Quaternion::rotation_z(u_slowalt * 0.1);
next.control.orientation = Quaternion::rotation_x(s_a.stc.3 + u_slow * 0.1)
* Quaternion::rotation_y(s_a.stc.4)
* Quaternion::rotation_z(s_a.stc.5 + u_slowalt * 0.1);
},
Some(ToolKind::Shield(_)) => {
next.control.position = Vec3::new(0.0, 0.0, 0.0);

5
voxygen/src/anim/src/fish_medium/idle.rs
View File

@ -31,23 +31,18 @@ impl Animation for IdleAnimation {
next.head.position = Vec3::new(0.0, 7.5, 15.0) / 11.0;
next.head.orientation = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
next.torso.position = Vec3::new(0.0, 4.5, 2.0);
next.torso.orientation = Quaternion::rotation_x(0.0);
next.rear.position = Vec3::new(0.0, 3.1, -4.5);
next.rear.orientation = Quaternion::rotation_z(0.0);
next.tail.position = Vec3::new(0.0, -13.0, 8.0) / 11.0;
next.tail.orientation = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
next.fin_l.position = Vec3::new(0.0, -11.7, 11.0) / 11.0;
next.fin_l.orientation = Quaternion::rotation_y(0.0);
next.fin_r.position = Vec3::new(0.0, 0.0, 12.0) / 11.0;
next.fin_r.orientation = Quaternion::rotation_y(0.0);
next

5
voxygen/src/anim/src/fish_medium/jump.rs
View File

@ -31,23 +31,18 @@ impl Animation for JumpAnimation {
next.head.position = Vec3::new(0.0, 7.5, 15.0) / 11.0;
next.head.orientation = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
next.torso.position = Vec3::new(0.0, 4.5, 2.0);
next.torso.orientation = Quaternion::rotation_x(0.0);
next.rear.position = Vec3::new(0.0, 3.1, -4.5);
next.rear.orientation = Quaternion::rotation_z(0.0);
next.tail.position = Vec3::new(0.0, -13.0, 8.0) / 11.0;
next.tail.orientation = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
next.fin_l.position = Vec3::new(0.0, -11.7, 11.0) / 11.0;
next.fin_l.orientation = Quaternion::rotation_y(0.0);
next.fin_r.position = Vec3::new(0.0, 0.0, 12.0) / 11.0;
next.fin_r.orientation = Quaternion::rotation_y(0.0);
next

5
voxygen/src/anim/src/fish_medium/run.rs
View File

@ -31,23 +31,18 @@ impl Animation for RunAnimation {
next.head.position = Vec3::new(0.0, 7.5, 15.0) / 11.0;
next.head.orientation = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
next.torso.position = Vec3::new(0.0, 4.5, 2.0);
next.torso.orientation = Quaternion::rotation_x(0.0);
next.rear.position = Vec3::new(0.0, 3.1, -4.5);
next.rear.orientation = Quaternion::rotation_z(0.0);
next.tail.position = Vec3::new(0.0, -13.0, 8.0) / 11.0;
next.tail.orientation = Quaternion::rotation_z(0.0) * Quaternion::rotation_x(0.0);
next.fin_l.position = Vec3::new(0.0, -11.7, 11.0) / 11.0;
next.fin_l.orientation = Quaternion::rotation_y(0.0);
next.fin_r.position = Vec3::new(0.0, 0.0, 12.0) / 11.0;
next.fin_r.orientation = Quaternion::rotation_y(0.0);
next