diff --git a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron index 69901c6685..8eb2192a7b 100644 --- a/assets/voxygen/voxel/quadruped_medium_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_medium_central_manifest.ron @@ -159,7 +159,7 @@ central: ("npc.tuskram.male.neck"), ), jaw: ( - offset: (-5.0, 0.0, -1.5), + offset: (-5.0, 0.0, -8.0), central: ("npc.tuskram.male.jaw"), ), torso_front: ( diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index a4609a180b..8958197802 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -764,12 +764,60 @@ impl Body { ) } + // Physical offset relative to the mountee pub fn mounting_offset(&self) -> Vec3 { match self { - Body::Ship(ship::Body::DefaultAirship) => Vec3::from([0.0, 0.0, 10.0]), - Body::Ship(ship::Body::AirBalloon) => Vec3::from([0.0, 0.0, 5.0]), - _ => Vec3::unit_z(), + Body::QuadrupedMedium(quadruped_medium) => { + match (quadruped_medium.species, quadruped_medium.body_type) { + (quadruped_medium::Species::Grolgar, _) => [0.5, 0.5, 1.8], + (quadruped_medium::Species::Saber, _) => [0.3, 0.3, 1.3], + (quadruped_medium::Species::Tiger, _) => [0.2, 0.2, 1.4], + (quadruped_medium::Species::Tuskram, _) => [-0.5, -0.5, 1.5], + (quadruped_medium::Species::Lion, _) => [0.3, 0.3, 1.5], + (quadruped_medium::Species::Tarasque, _) => [0.6, 0.6, 2.0], + (quadruped_medium::Species::Wolf, _) => [0.5, 0.5, 1.3], + (quadruped_medium::Species::Frostfang, _) => [0.5, 0.5, 1.2], + (quadruped_medium::Species::Mouflon, _) => [0.3, 0.3, 1.2], + (quadruped_medium::Species::Catoblepas, _) => [0.0, 0.0, 2.0], + (quadruped_medium::Species::Bonerattler, _) => [0.5, 0.5, 1.2], + (quadruped_medium::Species::Deer, _) => [0.2, 0.2, 1.3], + (quadruped_medium::Species::Hirdrasil, _) => [0.0, 0.0, 1.4], + (quadruped_medium::Species::Roshwalr, _) => [0.5, 0.5, 1.8], + (quadruped_medium::Species::Donkey, _) => [0.5, 0.5, 1.5], + (quadruped_medium::Species::Camel, _) => [-0.1, -0.1, 2.8], + (quadruped_medium::Species::Zebra, _) => [0.5, 0.5, 1.8], + (quadruped_medium::Species::Antelope, _) => [0.3, 0.3, 1.4], + (quadruped_medium::Species::Kelpie, _) => [0.5, 0.5, 1.9], + (quadruped_medium::Species::Horse, _) => [0.0, 0.0, 2.0], + (quadruped_medium::Species::Barghest, _) => [0.5, 0.5, 2.2], + (quadruped_medium::Species::Cattle, quadruped_medium::BodyType::Male) => { + [0.5, 0.5, 2.6] + }, + (quadruped_medium::Species::Cattle, quadruped_medium::BodyType::Female) => { + [0.7, 0.7, 2.2] + }, + (quadruped_medium::Species::Darkhound, _) => [0.5, 0.5, 1.4], + (quadruped_medium::Species::Highland, _) => [0.5, 0.5, 2.3], + (quadruped_medium::Species::Yak, _) => [0.0, 0.0, 3.0], + (quadruped_medium::Species::Panda, _) => [-0.2, -0.2, 1.4], + (quadruped_medium::Species::Bear, _) => [-0.4, -0.4, 2.5], + (quadruped_medium::Species::Dreadhorn, _) => [0.2, 0.2, 3.5], + (quadruped_medium::Species::Moose, _) => [-0.6, -0.6, 2.1], + (quadruped_medium::Species::Snowleopard, _) => [-0.5, -0.5, 1.4], + // TODO: Fill in these values + (quadruped_medium::Species::Mammoth, _) => [0.0, 0.0, 0.0], + (quadruped_medium::Species::Ngoubou, _) => [0.0, 0.0, 0.0], + (quadruped_medium::Species::Llama, _) => [0.0, 0.0, 0.0], + (quadruped_medium::Species::Alpaca, _) => [0.0, 0.0, 0.0], + } + }, + Body::Ship(ship) => match ship { + ship::Body::DefaultAirship => [0.0, 0.0, 10.0], + ship::Body::AirBalloon => [0.0, 0.0, 5.0], + }, + _ => [0.0, 0.0, 0.0], } + .into() } } diff --git a/common/systems/src/character_behavior.rs b/common/systems/src/character_behavior.rs index db48764235..e9de5617c3 100644 --- a/common/systems/src/character_behavior.rs +++ b/common/systems/src/character_behavior.rs @@ -352,11 +352,10 @@ impl<'a> System<'a> for Sys { // Mounted occurs after control actions have been handled // If mounted, character state is controlled by mount - // TODO: Make mounting a state if let Some(Mounting(_)) = read_data.mountings.get(entity) { - let sit_state = CharacterState::Sit {}; - if join_struct.char_state.get_unchecked() != &sit_state { - *join_struct.char_state.get_mut_unchecked() = sit_state; + let idle_state = CharacterState::Idle {}; + if join_struct.char_state.get_unchecked() != &idle_state { + *join_struct.char_state.get_mut_unchecked() = idle_state; } continue; } diff --git a/common/systems/src/mount.rs b/common/systems/src/mount.rs index 016fb9eb60..328f0e93fb 100644 --- a/common/systems/src/mount.rs +++ b/common/systems/src/mount.rs @@ -68,7 +68,14 @@ impl<'a> System<'a> for Sys { if let (Some(pos), Some(ori), Some(vel)) = (pos, ori, vel) { let mounting_offset = body.map_or(Vec3::unit_z(), Body::mounting_offset); - let _ = positions.insert(mounter, Pos(pos.0 + mounting_offset)); + let _ = positions.insert( + mounter, + Pos(Vec3 { + x: pos.0.x + ori.look_dir().x * mounting_offset.x, + y: pos.0.y + ori.look_dir().y * mounting_offset.y, + z: pos.0.z + mounting_offset.z, + }), + ); let _ = orientations.insert(mounter, ori); let _ = velocities.insert(mounter, vel); } diff --git a/voxygen/anim/src/biped_large/mod.rs b/voxygen/anim/src/biped_large/mod.rs index 9a5ca48719..3acd952bbd 100644 --- a/voxygen/anim/src/biped_large/mod.rs +++ b/voxygen/anim/src/biped_large/mod.rs @@ -31,7 +31,7 @@ pub use self::{ wield::WieldAnimation, }; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::{convert::TryFrom, f32::consts::PI}; @@ -79,7 +79,7 @@ impl Skeleton for BipedLargeSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let upper_torso = Mat4::::from(self.upper_torso); let torso_mat = base_mat * Mat4::::from(self.torso); @@ -126,7 +126,10 @@ impl Skeleton for BipedLargeSkeleton { // FIXME: Should this be control_l_mat? make_bone(upper_torso_mat * control_mat * hand_l_mat * Mat4::::from(self.hold)), ]; - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: self.torso, + } } } diff --git a/voxygen/anim/src/biped_small/mod.rs b/voxygen/anim/src/biped_small/mod.rs index ba89f7c4c4..1d4c0c1e57 100644 --- a/voxygen/anim/src/biped_small/mod.rs +++ b/voxygen/anim/src/biped_small/mod.rs @@ -12,7 +12,7 @@ pub use self::{ shoot::ShootAnimation, stunned::StunnedAnimation, wield::WieldAnimation, }; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -47,7 +47,7 @@ impl Skeleton for BipedSmallSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let chest_mat = base_mat * Mat4::::from(self.chest); let pants_mat = chest_mat * Mat4::::from(self.pants); let control_mat = chest_mat * Mat4::::from(self.control); @@ -64,7 +64,10 @@ impl Skeleton for BipedSmallSkeleton { make_bone(base_mat * Mat4::::from(self.foot_l)), make_bone(base_mat * Mat4::::from(self.foot_r)), ]; - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: self.chest, + } } } diff --git a/voxygen/anim/src/bird_large/mod.rs b/voxygen/anim/src/bird_large/mod.rs index 58a3ae27a1..35a699d8c5 100644 --- a/voxygen/anim/src/bird_large/mod.rs +++ b/voxygen/anim/src/bird_large/mod.rs @@ -18,7 +18,7 @@ pub use self::{ shoot::ShootAnimation, stunned::StunnedAnimation, summon::SummonAnimation, swim::SwimAnimation, }; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -57,7 +57,7 @@ impl Skeleton for BirdLargeSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let chest_mat = base_mat * Mat4::::from(self.chest); let neck_mat = chest_mat * Mat4::::from(self.neck); let head_mat = neck_mat * Mat4::::from(self.head); @@ -93,7 +93,10 @@ impl Skeleton for BirdLargeSkeleton { make_bone(foot_l_mat), make_bone(foot_r_mat), ]; - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: self.chest, + } } } diff --git a/voxygen/anim/src/bird_medium/mod.rs b/voxygen/anim/src/bird_medium/mod.rs index 5caa8f17ae..52c0ae41fe 100644 --- a/voxygen/anim/src/bird_medium/mod.rs +++ b/voxygen/anim/src/bird_medium/mod.rs @@ -6,7 +6,7 @@ pub mod run; // Reexports pub use self::{feed::FeedAnimation, fly::FlyAnimation, idle::IdleAnimation, run::RunAnimation}; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -36,7 +36,7 @@ impl Skeleton for BirdMediumSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let torso_mat = base_mat * Mat4::::from(self.torso); *(<&mut [_; Self::BONE_COUNT]>::try_from(&mut buf[0..Self::BONE_COUNT]).unwrap()) = [ @@ -48,7 +48,10 @@ impl Skeleton for BirdMediumSkeleton { make_bone(base_mat * Mat4::::from(self.leg_l)), make_bone(base_mat * Mat4::::from(self.leg_r)), ]; - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: self.torso, + } } } diff --git a/voxygen/anim/src/character/mod.rs b/voxygen/anim/src/character/mod.rs index 6047f97717..8bcbc22a62 100644 --- a/voxygen/anim/src/character/mod.rs +++ b/voxygen/anim/src/character/mod.rs @@ -13,6 +13,7 @@ pub mod gliding; pub mod idle; pub mod jump; pub mod leapmelee; +pub mod mount; pub mod repeater; pub mod roll; pub mod run; @@ -36,13 +37,14 @@ pub use self::{ chargeswing::ChargeswingAnimation, climb::ClimbAnimation, consume::ConsumeAnimation, dance::DanceAnimation, dash::DashAnimation, equip::EquipAnimation, glidewield::GlideWieldAnimation, gliding::GlidingAnimation, idle::IdleAnimation, - jump::JumpAnimation, leapmelee::LeapAnimation, repeater::RepeaterAnimation, - roll::RollAnimation, run::RunAnimation, shockwave::ShockwaveAnimation, shoot::ShootAnimation, - sit::SitAnimation, sneak::SneakAnimation, spin::SpinAnimation, spinmelee::SpinMeleeAnimation, - staggered::StaggeredAnimation, stand::StandAnimation, stunned::StunnedAnimation, - swim::SwimAnimation, swimwield::SwimWieldAnimation, talk::TalkAnimation, wield::WieldAnimation, + jump::JumpAnimation, leapmelee::LeapAnimation, mount::MountAnimation, + repeater::RepeaterAnimation, roll::RollAnimation, run::RunAnimation, + shockwave::ShockwaveAnimation, shoot::ShootAnimation, sit::SitAnimation, sneak::SneakAnimation, + spin::SpinAnimation, spinmelee::SpinMeleeAnimation, staggered::StaggeredAnimation, + stand::StandAnimation, stunned::StunnedAnimation, swim::SwimAnimation, + swimwield::SwimWieldAnimation, talk::TalkAnimation, wield::WieldAnimation, }; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp; use core::{convert::TryFrom, f32::consts::PI}; @@ -71,12 +73,20 @@ skeleton_impls!(struct CharacterSkeleton { control_r, :: // Begin non-bone fields holding_lantern: bool, + offsets: Option>, + mountee_body: Option, }); impl CharacterSkeleton { - pub fn new(holding_lantern: bool) -> Self { + pub fn new( + holding_lantern: bool, + offsets: Option>, + mountee_body: Option, + ) -> Self { Self { holding_lantern, + offsets, + mountee_body, ..Self::default() } } @@ -96,8 +106,22 @@ impl Skeleton for CharacterSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { - let torso_mat = base_mat * Mat4::::from(self.torso); + ) -> Offsets { + let torso_mat = base_mat + * if let Some((offset, body)) = self.offsets.zip(self.mountee_body) { + let hitbox_offsets = body.mounting_offset(); + let visual_offset = mounting_offset(body); + + Mat4::::from(Transform { + position: offset.position + - Vec3::from([0.0, hitbox_offsets.y, hitbox_offsets.z]), + orientation: offset.orientation, + scale: Vec3::::one(), + }) * Mat4::::from(self.torso).translated_3d(visual_offset) + } else { + Mat4::::from(self.torso) + }; + let chest_mat = torso_mat * Mat4::::from(self.chest); let head_mat = chest_mat * Mat4::::from(self.head); let shorts_mat = chest_mat * Mat4::::from(self.shorts); @@ -132,7 +156,10 @@ impl Skeleton for CharacterSkeleton { // FIXME: Should this be control_l_mat? make_bone(control_mat * hand_l_mat * Mat4::::from(self.hold)), ]; - (lantern_mat * Vec4::new(0.0, 0.0, -4.0, 1.0)).xyz() + Offsets { + lantern: (lantern_mat * Vec4::new(0.0, 0.0, -4.0, 1.0)).xyz(), + mount_bone: self.chest, + } } } @@ -329,3 +356,53 @@ impl<'a> From<&'a Body> for SkeletonAttr { } } } + +pub fn mounting_offset(body: comp::Body) -> Vec3 { + match body { + comp::Body::QuadrupedMedium(quadruped_medium) => { + match (quadruped_medium.species, quadruped_medium.body_type) { + (comp::quadruped_medium::Species::Grolgar, _) => Vec3::from([0.0, -0.6, 0.5]), + (comp::quadruped_medium::Species::Saber, _) => Vec3::from([0.0, -0.75, 0.23]), + (comp::quadruped_medium::Species::Tiger, _) => Vec3::from([0.0, -0.75, 0.23]), + (comp::quadruped_medium::Species::Tuskram, _) => Vec3::from([0.0, -0.75, 0.25]), + (comp::quadruped_medium::Species::Lion, _) => Vec3::from([0.0, -0.9, 0.25]), + (comp::quadruped_medium::Species::Tarasque, _) => Vec3::from([0.0, -1.1, 0.3]), + (comp::quadruped_medium::Species::Wolf, _) => Vec3::from([0.0, -0.7, 0.15]), + (comp::quadruped_medium::Species::Frostfang, _) => Vec3::from([0.0, -0.8, 0.1]), + (comp::quadruped_medium::Species::Mouflon, _) => Vec3::from([0.0, -0.8, 0.1]), + (comp::quadruped_medium::Species::Catoblepas, _) => Vec3::from([0.0, -0.4, 0.4]), + (comp::quadruped_medium::Species::Bonerattler, _) => Vec3::from([0.0, -0.3, 0.2]), + (comp::quadruped_medium::Species::Deer, _) => Vec3::from([0.0, -0.9, 0.1]), + (comp::quadruped_medium::Species::Hirdrasil, _) => Vec3::from([0.0, -1.0, 0.0]), + (comp::quadruped_medium::Species::Roshwalr, _) => Vec3::from([0.0, -0.2, 0.7]), + (comp::quadruped_medium::Species::Donkey, _) => Vec3::from([0.0, -0.5, 0.15]), + (comp::quadruped_medium::Species::Camel, _) => Vec3::from([0.0, -1.4, 0.3]), + (comp::quadruped_medium::Species::Zebra, _) => Vec3::from([0.0, -0.6, 0.1]), + (comp::quadruped_medium::Species::Antelope, _) => Vec3::from([0.0, -0.8, 0.1]), + (comp::quadruped_medium::Species::Kelpie, _) => Vec3::from([0.0, -0.8, 0.05]), + (comp::quadruped_medium::Species::Horse, _) => Vec3::from([0.0, -0.8, 0.1]), + (comp::quadruped_medium::Species::Barghest, _) => Vec3::from([0.0, -0.8, 0.6]), + ( + comp::quadruped_medium::Species::Cattle, + comp::quadruped_medium::BodyType::Male, + ) => Vec3::from([0.0, -0.4, 0.7]), + ( + comp::quadruped_medium::Species::Cattle, + comp::quadruped_medium::BodyType::Female, + ) => Vec3::from([0.0, -0.3, 0.5]), + (comp::quadruped_medium::Species::Darkhound, _) => Vec3::from([0.0, -0.5, 0.2]), + (comp::quadruped_medium::Species::Highland, _) => Vec3::from([0.0, -0.2, 0.8]), + (comp::quadruped_medium::Species::Yak, _) => Vec3::from([0.0, -0.2, 0.8]), + (comp::quadruped_medium::Species::Panda, _) => Vec3::from([0.0, -0.8, 0.2]), + (comp::quadruped_medium::Species::Bear, _) => Vec3::from([0.0, -1.5, 0.6]), + (comp::quadruped_medium::Species::Dreadhorn, _) => Vec3::from([0.0, -1.5, 1.6]), + (comp::quadruped_medium::Species::Moose, _) => Vec3::from([0.0, -0.9, 0.3]), + (comp::quadruped_medium::Species::Snowleopard, _) => Vec3::from([0.0, -0.9, 0.2]), + } + }, + + comp::Body::Ship(comp::ship::Body::DefaultAirship) => Vec3::from([0.0, 0.0, 10.0]), + comp::Body::Dragon(_) => Vec3::from([0.0, -0.7, 6.4]), + _ => Vec3::unit_z(), + } +} diff --git a/voxygen/anim/src/character/mount.rs b/voxygen/anim/src/character/mount.rs new file mode 100644 index 0000000000..29ec687a56 --- /dev/null +++ b/voxygen/anim/src/character/mount.rs @@ -0,0 +1,217 @@ +use super::{ + super::{vek::*, Animation}, + CharacterSkeleton, SkeletonAttr, +}; +use common::comp::item::{Hands, ToolKind}; +use std::{f32::consts::PI, ops::Mul}; + +pub struct MountAnimation; + +impl Animation for MountAnimation { + #[allow(clippy::type_complexity)] + type Dependency<'a> = ( + Option, + Option, + (Option, Option), + f32, + Vec3, + Vec3, + Vec3, + Vec3, + ); + type Skeleton = CharacterSkeleton; + + #[cfg(feature = "use-dyn-lib")] + const UPDATE_FN: &'static [u8] = b"character_mount\0"; + + #[cfg_attr(feature = "be-dyn-lib", export_name = "character_mount")] + fn update_skeleton_inner<'a>( + skeleton: &Self::Skeleton, + ( + active_tool_kind, + second_tool_kind, + hands, + global_time, + velocity, + avg_vel, + orientation, + last_ori, + ): Self::Dependency<'a>, + anim_time: f32, + _rate: &mut f32, + s_a: &SkeletonAttr, + ) -> Self::Skeleton { + let mut next = (*skeleton).clone(); + + let slow = (anim_time * 1.0).sin(); + let slowa = (anim_time * 1.0 + PI / 2.0).sin(); + let stop = (anim_time * 3.0).min(PI / 2.0).sin(); + + let head_look = Vec2::new( + (global_time * 0.05 + anim_time / 15.0) + .floor() + .mul(7331.0) + .sin() + * 0.25, + (global_time * 0.05 + anim_time / 15.0) + .floor() + .mul(1337.0) + .sin() + * 0.125, + ); + + let ori: Vec2 = Vec2::from(orientation); + let last_ori = Vec2::from(last_ori); + let speed = (Vec2::::from(velocity).magnitude()).min(24.0); + let canceler = (speed / 24.0).powf(0.6); + let _x_tilt = avg_vel.z.atan2(avg_vel.xy().magnitude()) * canceler; + let _tilt = if ::vek::Vec2::new(ori, last_ori) + .map(|o| o.magnitude_squared()) + .map(|m| m > 0.001 && m.is_finite()) + .reduce_and() + && ori.angle_between(last_ori).is_finite() + { + ori.angle_between(last_ori).min(0.2) + * last_ori.determine_side(Vec2::zero(), ori).signum() + } else { + 0.0 + } * 1.3; + + next.head.scale = Vec3::one() * s_a.head_scale; + next.chest.scale = Vec3::one() * 1.01; + next.hand_l.scale = Vec3::one() * 1.04; + next.hand_r.scale = Vec3::one() * 1.04; + next.back.scale = Vec3::one() * 1.02; + next.hold.scale = Vec3::one() * 0.0; + next.lantern.scale = Vec3::one() * 0.65; + next.torso.scale = Vec3::one() / 11.0 * s_a.scaler; + next.shoulder_l.scale = Vec3::one() * 1.1; + next.shoulder_r.scale = Vec3::one() * 1.1; + + next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1 + slow * 0.1 + stop * -0.8); + next.head.orientation = Quaternion::rotation_z(head_look.x + slow * 0.2 - slow * 0.1) + * Quaternion::rotation_x((0.4 + slowa * -0.1 + slow * 0.1 + head_look.y).abs()); + + next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1); + next.chest.orientation = Quaternion::rotation_x(-0.6 + stop * 0.15); + + next.belt.position = Vec3::new(0.0, s_a.belt.0 + stop * 1.2, s_a.belt.1); + next.belt.orientation = Quaternion::rotation_x(stop * 0.3); + + next.back.position = Vec3::new(0.0, s_a.back.0, s_a.back.1); + + next.shorts.position = Vec3::new(0.0, s_a.shorts.0 + stop * 2.5, s_a.shorts.1 + stop * 0.6); + next.shorts.orientation = Quaternion::rotation_x(stop * 0.6); + + next.hand_l.position = Vec3::new( + -s_a.hand.0 + 4.0, + s_a.hand.1 + slowa * 0.15 + stop * 8.0, + s_a.hand.2 + slow * 0.7 + stop * 4.0, + ); + next.hand_l.orientation = + Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_z(-PI / 2.0); + + next.hand_r.position = Vec3::new( + s_a.hand.0 - 4.0, + s_a.hand.1 + slowa * 0.15 + stop * 8.0, + s_a.hand.2 + slow * 0.7 + stop * 4.0, + ); + next.hand_r.orientation = + Quaternion::rotation_x(PI / 2.0) * Quaternion::rotation_z(PI / 2.0); + + next.foot_l.position = Vec3::new(-s_a.foot.0 - 2.0, 4.0 + s_a.foot.1, s_a.foot.2); + next.foot_l.orientation = Quaternion::rotation_x(slow * 0.1 + stop * 0.4 + slow * 0.1) + * Quaternion::rotation_y(0.5); + + next.foot_r.position = Vec3::new(s_a.foot.0 + 2.0, 4.0 + s_a.foot.1, s_a.foot.2); + next.foot_r.orientation = Quaternion::rotation_x(slowa * 0.1 + stop * 0.4 + slowa * 0.1) + * Quaternion::rotation_y(-0.5); + + next.shoulder_l.position = Vec3::new(-s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2); + next.shoulder_l.orientation = Quaternion::rotation_x(0.0); + + next.shoulder_r.position = Vec3::new(s_a.shoulder.0, s_a.shoulder.1, s_a.shoulder.2); + next.shoulder_r.orientation = Quaternion::rotation_x(0.0); + + next.torso.position = Vec3::new(0.0, 0.0, stop * -0.16) * s_a.scaler; + + if skeleton.holding_lantern { + next.hand_r.position = Vec3::new( + s_a.hand.0 + 1.0 - head_look.x * 8.0, + s_a.hand.1 + 5.0 + head_look.x * 6.0, + s_a.hand.2 + 9.0 + head_look.y * 6.0, + ); + next.hand_r.orientation = Quaternion::rotation_x(2.25) + * Quaternion::rotation_z(0.9) + * Quaternion::rotation_y(head_look.x * 3.0) + * Quaternion::rotation_x(head_look.y * 3.0); + + let fast = (anim_time * 5.0).sin(); + let fast2 = (anim_time * 4.5 + 8.0).sin(); + + next.lantern.position = Vec3::new(-0.5, -0.5, -2.5); + next.lantern.orientation = next.hand_r.orientation.inverse() + * Quaternion::rotation_x(fast * 0.1) + * Quaternion::rotation_y(fast2 * 0.1); + } + + next.glider.position = Vec3::new(0.0, 0.0, 10.0); + next.glider.scale = Vec3::one() * 0.0; + next.hold.position = Vec3::new(0.4, -0.3, -5.8); + match hands { + (Some(Hands::Two), _) | (None, Some(Hands::Two)) => match active_tool_kind { + Some(ToolKind::Bow) => { + next.main.position = Vec3::new(0.0, -5.0, 6.0); + next.main.orientation = + Quaternion::rotation_y(2.5) * Quaternion::rotation_z(1.57); + }, + 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); + }, + }, + (_, _) => {}, + }; + + match hands { + (Some(Hands::One), _) => match active_tool_kind { + Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => { + next.main.position = Vec3::new(-4.0, -5.0, 10.0); + next.main.orientation = + Quaternion::rotation_y(2.35) * Quaternion::rotation_z(1.57); + }, + + _ => {}, + }, + (_, _) => {}, + }; + match hands { + (None | Some(Hands::One), Some(Hands::One)) => match second_tool_kind { + Some(ToolKind::Axe) | Some(ToolKind::Hammer) | Some(ToolKind::Sword) => { + next.second.position = Vec3::new(4.0, -6.0, 10.0); + next.second.orientation = + Quaternion::rotation_y(-2.5) * Quaternion::rotation_z(-1.57); + }, + _ => {}, + }, + (_, _) => {}, + }; + + next.second.scale = match hands { + (Some(Hands::One), Some(Hands::One)) => Vec3::one(), + (_, _) => Vec3::zero(), + }; + + if let (None, Some(Hands::Two)) = hands { + next.second = next.main; + } + + next + } +} diff --git a/voxygen/anim/src/dragon/mod.rs b/voxygen/anim/src/dragon/mod.rs index 9e5d39d200..4b3221dc40 100644 --- a/voxygen/anim/src/dragon/mod.rs +++ b/voxygen/anim/src/dragon/mod.rs @@ -5,7 +5,7 @@ pub mod run; // Reexports pub use self::{fly::FlyAnimation, idle::IdleAnimation, run::RunAnimation}; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -43,7 +43,7 @@ impl Skeleton for DragonSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let chest_front_mat = base_mat * Mat4::::from(self.chest_front); let chest_rear_mat = chest_front_mat * Mat4::::from(self.chest_rear); let head_lower_mat = chest_front_mat * Mat4::::from(self.head_lower); @@ -69,7 +69,10 @@ impl Skeleton for DragonSkeleton { make_bone(chest_rear_mat * Mat4::::from(self.foot_bl)), make_bone(chest_rear_mat * Mat4::::from(self.foot_br)), ]; - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: self.chest_front, + } } } diff --git a/voxygen/anim/src/fish_medium/mod.rs b/voxygen/anim/src/fish_medium/mod.rs index 8c68c9e4d8..6ed92d7259 100644 --- a/voxygen/anim/src/fish_medium/mod.rs +++ b/voxygen/anim/src/fish_medium/mod.rs @@ -4,7 +4,7 @@ pub mod swim; // Reexports pub use self::{idle::IdleAnimation, swim::SwimAnimation}; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -33,7 +33,7 @@ impl Skeleton for FishMediumSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let chest_front_mat = base_mat * Mat4::::from(self.chest_front); let chest_back_mat = Mat4::::from(self.chest_back); let head_mat = Mat4::::from(self.head); @@ -47,7 +47,10 @@ impl Skeleton for FishMediumSkeleton { make_bone(chest_front_mat * Mat4::::from(self.fin_l)), make_bone(chest_front_mat * Mat4::::from(self.fin_r)), ]; - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: self.chest_front, + } } } diff --git a/voxygen/anim/src/fish_small/mod.rs b/voxygen/anim/src/fish_small/mod.rs index 0a644da947..198ce1fac7 100644 --- a/voxygen/anim/src/fish_small/mod.rs +++ b/voxygen/anim/src/fish_small/mod.rs @@ -4,7 +4,7 @@ pub mod swim; // Reexports pub use self::{idle::IdleAnimation, swim::SwimAnimation}; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -30,7 +30,7 @@ impl Skeleton for FishSmallSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let chest_mat = base_mat * Mat4::::from(self.chest); *(<&mut [_; Self::BONE_COUNT]>::try_from(&mut buf[0..Self::BONE_COUNT]).unwrap()) = [ @@ -39,7 +39,10 @@ impl Skeleton for FishSmallSkeleton { make_bone(chest_mat * Mat4::::from(self.fin_l)), make_bone(chest_mat * Mat4::::from(self.fin_r)), ]; - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: self.chest, + } } } diff --git a/voxygen/anim/src/fixture/mod.rs b/voxygen/anim/src/fixture/mod.rs index edc2c38d80..f24e2918f8 100644 --- a/voxygen/anim/src/fixture/mod.rs +++ b/voxygen/anim/src/fixture/mod.rs @@ -1,4 +1,4 @@ -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; pub type Body = (); @@ -31,9 +31,12 @@ impl Skeleton for FixtureSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { buf[0] = make_bone(base_mat); - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: Transform::default(), + } } } diff --git a/voxygen/anim/src/golem/mod.rs b/voxygen/anim/src/golem/mod.rs index ef5acd9057..af19354a00 100644 --- a/voxygen/anim/src/golem/mod.rs +++ b/voxygen/anim/src/golem/mod.rs @@ -12,7 +12,7 @@ pub use self::{ shockwave::ShockwaveAnimation, shoot::ShootAnimation, spinmelee::SpinMeleeAnimation, }; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -47,7 +47,7 @@ impl Skeleton for GolemSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let torso_mat = base_mat * Mat4::::from(self.torso); let upper_torso_mat = torso_mat * Mat4::::from(self.upper_torso); let lower_torso_mat = upper_torso_mat * Mat4::::from(self.lower_torso); @@ -70,7 +70,10 @@ impl Skeleton for GolemSkeleton { make_bone(leg_l_mat * Mat4::::from(self.foot_l)), make_bone(leg_r_mat * Mat4::::from(self.foot_r)), ]; - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: self.torso, + } } } diff --git a/voxygen/anim/src/lib.rs b/voxygen/anim/src/lib.rs index ab9d933338..39d7530bbf 100644 --- a/voxygen/anim/src/lib.rs +++ b/voxygen/anim/src/lib.rs @@ -98,6 +98,12 @@ lazy_static! { #[cfg(feature = "use-dyn-lib")] pub fn init() { lazy_static::initialize(&LIB); } +// Offsets that will be returned after computing the skeleton matrices +pub struct Offsets { + pub lantern: Vec3, + pub mount_bone: Transform, +} + pub trait Skeleton: Send + Sync + 'static { type Attr; type Body; @@ -111,14 +117,14 @@ pub trait Skeleton: Send + Sync + 'static { &self, base_mat: Mat4, buf: &mut [FigureBoneData; MAX_BONE_COUNT], - ) -> Vec3; + ) -> Offsets; } pub fn compute_matrices( skeleton: &S, base_mat: Mat4, buf: &mut [FigureBoneData; MAX_BONE_COUNT], -) -> Vec3 { +) -> Offsets { #[cfg(not(feature = "use-dyn-lib"))] { S::compute_matrices_inner(skeleton, base_mat, buf) @@ -130,7 +136,7 @@ pub fn compute_matrices( #[allow(clippy::type_complexity)] let compute_fn: voxygen_dynlib::Symbol< - fn(&S, Mat4, &mut [FigureBoneData; MAX_BONE_COUNT]) -> Vec3, + fn(&S, Mat4, &mut [FigureBoneData; MAX_BONE_COUNT]) -> Offsets, > = unsafe { lib.get(S::COMPUTE_FN) }.unwrap_or_else(|e| { panic!( "Trying to use: {} but had error: {:?}", diff --git a/voxygen/anim/src/object/mod.rs b/voxygen/anim/src/object/mod.rs index 7a58390ed0..acafbd4497 100644 --- a/voxygen/anim/src/object/mod.rs +++ b/voxygen/anim/src/object/mod.rs @@ -5,7 +5,7 @@ pub mod shoot; // Reexports pub use self::{beam::BeamAnimation, idle::IdleAnimation, shoot::ShootAnimation}; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -29,14 +29,17 @@ impl Skeleton for ObjectSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let bone0_mat = base_mat * Mat4::::from(self.bone0); *(<&mut [_; Self::BONE_COUNT]>::try_from(&mut buf[0..Self::BONE_COUNT]).unwrap()) = [ make_bone(bone0_mat * Mat4::scaling_3d(1.0 / 11.0)), make_bone(Mat4::::from(self.bone1) * Mat4::scaling_3d(1.0 / 11.0)), /* Decorellated from ori */ ]; - Vec3::unit_z() * 0.5 + Offsets { + lantern: Vec3::default(), + mount_bone: self.bone0, + } } } diff --git a/voxygen/anim/src/quadruped_low/mod.rs b/voxygen/anim/src/quadruped_low/mod.rs index a9971df988..7357813f1e 100644 --- a/voxygen/anim/src/quadruped_low/mod.rs +++ b/voxygen/anim/src/quadruped_low/mod.rs @@ -16,7 +16,7 @@ pub use self::{ stunned::StunnedAnimation, tailwhip::TailwhipAnimation, }; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -48,7 +48,7 @@ impl Skeleton for QuadrupedLowSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let chest_mat = base_mat * Mat4::::from(self.chest); let tail_front = chest_mat * Mat4::::from(self.tail_front); let head_lower_mat = chest_mat * Mat4::::from(self.head_lower); @@ -66,7 +66,10 @@ impl Skeleton for QuadrupedLowSkeleton { make_bone(chest_mat * Mat4::::from(self.foot_bl)), make_bone(chest_mat * Mat4::::from(self.foot_br)), ]; - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: self.chest, + } } } diff --git a/voxygen/anim/src/quadruped_medium/mod.rs b/voxygen/anim/src/quadruped_medium/mod.rs index 96cdd6a2ac..865138373c 100644 --- a/voxygen/anim/src/quadruped_medium/mod.rs +++ b/voxygen/anim/src/quadruped_medium/mod.rs @@ -16,7 +16,7 @@ pub use self::{ run::RunAnimation, stunned::StunnedAnimation, }; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -38,6 +38,7 @@ skeleton_impls!(struct QuadrupedMediumSkeleton { + foot_fr, + foot_bl, + foot_br, + mount, }); impl Skeleton for QuadrupedMediumSkeleton { @@ -53,7 +54,7 @@ impl Skeleton for QuadrupedMediumSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let torso_front_mat = base_mat * Mat4::::from(self.torso_front); let torso_back_mat = torso_front_mat * Mat4::::from(self.torso_back); let neck_mat = torso_front_mat * Mat4::::from(self.neck); @@ -80,7 +81,10 @@ impl Skeleton for QuadrupedMediumSkeleton { make_bone(leg_bl_mat * Mat4::::from(self.foot_bl)), make_bone(leg_br_mat * Mat4::::from(self.foot_br)), ]; - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: self.torso_front, + } } } @@ -152,7 +156,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Frostfang, _) => (1.0, -2.0), (Mouflon, _) => (0.5, 1.5), (Catoblepas, _) => (-1.0, -6.5), - (Bonerattler, _) => (1.0, 2.5), + (Bonerattler, _) => (0.0, 1.5), (Deer, Male) => (1.5, 3.5), (Deer, Female) => (1.5, 3.5), (Hirdrasil, _) => (0.0, 5.0), @@ -191,7 +195,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Frostfang, _) => (0.5, 1.5), (Mouflon, _) => (-1.0, 1.0), (Catoblepas, _) => (19.5, -2.0), - (Bonerattler, _) => (9.0, -0.5), + (Bonerattler, _) => (7.0, -0.5), (Deer, _) => (-2.5, 1.0), (Hirdrasil, _) => (-1.0, 0.5), (Roshwalr, _) => (0.0, 1.0), @@ -303,7 +307,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Frostfang, _) => (9.0, 11.5), (Mouflon, _) => (11.0, 14.0), (Catoblepas, _) => (7.5, 19.5), - (Bonerattler, _) => (6.0, 12.5), + (Bonerattler, _) => (6.0, 11.0), (Deer, _) => (11.0, 13.5), (Hirdrasil, _) => (11.0, 14.5), (Roshwalr, _) => (6.0, 12.5), @@ -415,7 +419,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Frostfang, _) => (5.5, -5.5, -2.0), (Mouflon, _) => (4.0, -5.0, -4.0), (Catoblepas, _) => (7.0, 2.0, -5.0), - (Bonerattler, _) => (5.5, 5.0, -4.0), + (Bonerattler, _) => (5.5, 5.0, -2.5), (Deer, _) => (3.5, -4.5, -3.5), (Hirdrasil, _) => (4.5, -5.0, -2.5), (Roshwalr, _) => (8.0, -2.5, -2.5), @@ -452,7 +456,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Frostfang, _) => (3.5, -4.5, -2.0), (Mouflon, _) => (3.5, -8.0, -3.5), (Catoblepas, _) => (6.0, -2.5, -2.5), - (Bonerattler, _) => (6.0, -8.0, -4.0), + (Bonerattler, _) => (6.0, -8.0, -2.5), (Deer, _) => (3.0, -6.5, -3.5), (Hirdrasil, _) => (4.0, -6.5, -3.0), (Roshwalr, _) => (7.0, -7.0, -2.5), diff --git a/voxygen/anim/src/quadruped_small/mod.rs b/voxygen/anim/src/quadruped_small/mod.rs index 5850882906..537257b84a 100644 --- a/voxygen/anim/src/quadruped_small/mod.rs +++ b/voxygen/anim/src/quadruped_small/mod.rs @@ -11,7 +11,7 @@ pub use self::{ run::RunAnimation, stunned::StunnedAnimation, }; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -40,7 +40,7 @@ impl Skeleton for QuadrupedSmallSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let chest_mat = base_mat * Mat4::::from(self.chest); *(<&mut [_; Self::BONE_COUNT]>::try_from(&mut buf[0..Self::BONE_COUNT]).unwrap()) = [ @@ -52,7 +52,10 @@ impl Skeleton for QuadrupedSmallSkeleton { make_bone(chest_mat * Mat4::::from(self.leg_br)), make_bone(chest_mat * Mat4::::from(self.tail)), ]; - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: self.chest, + } } } diff --git a/voxygen/anim/src/ship/mod.rs b/voxygen/anim/src/ship/mod.rs index 80ed5ceb05..c9c4cb7ef4 100644 --- a/voxygen/anim/src/ship/mod.rs +++ b/voxygen/anim/src/ship/mod.rs @@ -3,7 +3,7 @@ pub mod idle; // Reexports pub use self::idle::IdleAnimation; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -29,7 +29,7 @@ impl Skeleton for ShipSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let bone0_mat = base_mat * Mat4::::from(self.bone0); *(<&mut [_; Self::BONE_COUNT]>::try_from(&mut buf[0..Self::BONE_COUNT]).unwrap()) = [ @@ -38,7 +38,10 @@ impl Skeleton for ShipSkeleton { make_bone(bone0_mat * Mat4::::from(self.bone2) * Mat4::scaling_3d(1.0 / 11.0)), /* Decorellated from ori */ make_bone(bone0_mat * Mat4::::from(self.bone3) * Mat4::scaling_3d(1.0 / 11.0)), /* Decorellated from ori */ ]; - Vec3::unit_z() * 0.5 + Offsets { + lantern: Vec3::default(), + mount_bone: self.bone0, + } } } diff --git a/voxygen/anim/src/theropod/mod.rs b/voxygen/anim/src/theropod/mod.rs index 900b9d7d51..75f0852b73 100644 --- a/voxygen/anim/src/theropod/mod.rs +++ b/voxygen/anim/src/theropod/mod.rs @@ -11,7 +11,7 @@ pub use self::{ jump::JumpAnimation, run::RunAnimation, }; -use super::{make_bone, vek::*, FigureBoneData, Skeleton}; +use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton}; use common::comp::{self}; use core::convert::TryFrom; @@ -47,7 +47,7 @@ impl Skeleton for TheropodSkeleton { &self, base_mat: Mat4, buf: &mut [FigureBoneData; super::MAX_BONE_COUNT], - ) -> Vec3 { + ) -> Offsets { let chest_front_mat = base_mat * Mat4::::from(self.chest_front); let neck_mat = chest_front_mat * Mat4::::from(self.neck); let head_mat = neck_mat * Mat4::::from(self.head); @@ -71,7 +71,10 @@ impl Skeleton for TheropodSkeleton { make_bone(leg_l_mat * Mat4::::from(self.foot_l)), make_bone(leg_r_mat * Mat4::::from(self.foot_r)), ]; - Vec3::default() + Offsets { + lantern: Vec3::default(), + mount_bone: self.chest_front, + } } } diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 79a5ee1304..8294612c10 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -31,11 +31,12 @@ use common::{ inventory::slot::EquipSlot, item::{Hands, ItemKind, ToolKind}, Body, CharacterState, Controller, Health, Inventory, Item, Last, LightAnimation, - LightEmitter, Ori, PhysicsState, PoiseState, Pos, Scale, Vel, + LightEmitter, Mounting, Ori, PhysicsState, PoiseState, Pos, Scale, Vel, }, resources::DeltaTime, states::utils::StageSection, terrain::TerrainChunk, + uid::UidAllocator, vol::RectRasterableVol, }; use common_base::span; @@ -48,7 +49,7 @@ use core::{ }; use guillotiere::AtlasAllocator; use hashbrown::HashMap; -use specs::{Entity as EcsEntity, Join, LazyUpdate, WorldExt}; +use specs::{saveload::MarkerAllocator, Entity as EcsEntity, Join, LazyUpdate, WorldExt}; use treeculler::{BVol, BoundingSphere}; use vek::*; @@ -572,6 +573,10 @@ impl FigureMgr { let mut update_buf = [Default::default(); anim::MAX_BONE_COUNT]; + let uid_allocator = ecs.read_resource::(); + + let bodies = ecs.read_storage::(); + for ( i, ( @@ -589,6 +594,7 @@ impl FigureMgr { inventory, item, light_emitter, + mountings, ), ) in ( &ecs.entities(), @@ -605,6 +611,7 @@ impl FigureMgr { ecs.read_storage::().maybe(), ecs.read_storage::().maybe(), ecs.read_storage::().maybe(), + ecs.read_storage::().maybe(), ) .join() .enumerate() @@ -687,7 +694,7 @@ impl FigureMgr { // shadow correctly until their next update. For now, we treat this // as an acceptable tradeoff. let radius = scale.unwrap_or(&Scale(1.0)).0 * 2.0; - let (in_frustum, lpindex) = if let Some(mut meta) = state { + let (in_frustum, lpindex) = if let Some(ref mut meta) = state { let (in_frustum, lpindex) = BoundingSphere::new(pos.0.into_array(), radius) .coherent_test_against_frustum(frustum, meta.lpindex); let in_frustum = in_frustum || matches!(body, Body::Ship(_)); @@ -748,6 +755,16 @@ impl FigureMgr { let hands = (active_tool_hand, second_tool_hand); + // If a mountee exists, get its physical mounting offsets and its body + let (mountee_offsets, mountee_body) = (|| -> Option<_> { + let Mounting(entity) = mountings?; + let entity = uid_allocator.retrieve_entity_internal((*entity).into())?; + let body = *bodies.get(entity)?; + let meta = self.states.get_mut(&body, &entity)?; + Some((Some(meta.mountee_offset), Some(body))) + })() + .unwrap_or((None, None)); + match body { Body::Humanoid(body) => { let (model, skeleton_attr) = self.model_cache.get_or_create_model( @@ -775,7 +792,14 @@ impl FigureMgr { .character_states .entry(entity) .or_insert_with(|| { - FigureState::new(renderer, CharacterSkeleton::new(holding_lantern)) + FigureState::new( + renderer, + CharacterSkeleton::new( + holding_lantern, + mountee_offsets, + mountee_body, + ), + ) }); // Average velocity relative to the current ground @@ -794,63 +818,82 @@ impl FigureMgr { physics.on_ground.is_some(), rel_vel.magnitude_squared() > MOVING_THRESHOLD_SQR, // Moving physics.in_liquid().is_some(), // In water + mountings.is_some(), ) { // Standing - (true, false, false) => anim::character::StandAnimation::update_skeleton( - &CharacterSkeleton::new(holding_lantern), - ( - active_tool_kind, - second_tool_kind, - hands, - // TODO: Update to use the quaternion. - ori * anim::vek::Vec3::::unit_y(), - state.last_ori * anim::vek::Vec3::::unit_y(), - time, - rel_avg_vel, - ), - state.state_time, - &mut state_animation_rate, - skeleton_attr, - ), + (true, false, false, false) => { + anim::character::StandAnimation::update_skeleton( + &CharacterSkeleton::new( + holding_lantern, + mountee_offsets, + mountee_body, + ), + ( + active_tool_kind, + second_tool_kind, + hands, + // TODO: Update to use the quaternion. + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), + time, + rel_avg_vel, + ), + state.state_time, + &mut state_animation_rate, + skeleton_attr, + ) + }, // Running - (true, true, false) => anim::character::RunAnimation::update_skeleton( - &CharacterSkeleton::new(holding_lantern), - ( - active_tool_kind, - second_tool_kind, - hands, - rel_vel, - // TODO: Update to use the quaternion. - ori * anim::vek::Vec3::::unit_y(), - state.last_ori * anim::vek::Vec3::::unit_y(), - time, - rel_avg_vel, - state.acc_vel, - ), - state.state_time, - &mut state_animation_rate, - skeleton_attr, - ), + (true, true, false, false) => { + anim::character::RunAnimation::update_skeleton( + &CharacterSkeleton::new( + holding_lantern, + mountee_offsets, + mountee_body, + ), + ( + active_tool_kind, + second_tool_kind, + hands, + rel_vel, + // TODO: Update to use the quaternion. + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), + time, + rel_avg_vel, + state.acc_vel, + ), + state.state_time, + &mut state_animation_rate, + skeleton_attr, + ) + }, // In air - (false, _, false) => anim::character::JumpAnimation::update_skeleton( - &CharacterSkeleton::new(holding_lantern), - ( - active_tool_kind, - second_tool_kind, - hands, - rel_vel, - // TODO: Update to use the quaternion. - ori * anim::vek::Vec3::::unit_y(), - state.last_ori * anim::vek::Vec3::::unit_y(), - time, - ), - state.state_time, - &mut state_animation_rate, - skeleton_attr, - ), + (false, _, false, false) => { + anim::character::JumpAnimation::update_skeleton( + &CharacterSkeleton::new( + holding_lantern, + mountee_offsets, + mountee_body, + ), + ( + active_tool_kind, + second_tool_kind, + hands, + rel_vel, + // TODO: Update to use the quaternion. + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), + time, + ), + state.state_time, + &mut state_animation_rate, + skeleton_attr, + ) + }, // Swim - (_, _, true) => anim::character::SwimAnimation::update_skeleton( - &CharacterSkeleton::new(holding_lantern), + (_, _, true, false) => anim::character::SwimAnimation::update_skeleton( + &CharacterSkeleton::new(holding_lantern, mountee_offsets, mountee_body), ( active_tool_kind, second_tool_kind, @@ -866,6 +909,24 @@ impl FigureMgr { &mut state_animation_rate, skeleton_attr, ), + // Mount + (_, _, _, true) => anim::character::MountAnimation::update_skeleton( + &CharacterSkeleton::new(holding_lantern, mountee_offsets, mountee_body), + ( + active_tool_kind, + second_tool_kind, + hands, + time, + rel_vel, + rel_avg_vel, + // TODO: Update to use the quaternion. + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), + ), + state.state_time, + &mut state_animation_rate, + skeleton_attr, + ), }; let target_bones = match &character { CharacterState::Roll(s) => { @@ -5331,6 +5392,7 @@ impl FigureColLights { pub struct FigureStateMeta { lantern_offset: anim::vek::Vec3, + mountee_offset: anim::vek::Transform, state_time: f32, last_ori: anim::vek::Quaternion, lpindex: u8, @@ -5371,12 +5433,12 @@ impl DerefMut for FigureState { impl FigureState { pub fn new(renderer: &mut Renderer, skeleton: S) -> Self { let mut buf = [Default::default(); anim::MAX_BONE_COUNT]; - let lantern_offset = - anim::compute_matrices(&skeleton, anim::vek::Mat4::identity(), &mut buf); + let offsets = anim::compute_matrices(&skeleton, anim::vek::Mat4::identity(), &mut buf); let bone_consts = figure_bone_data_from_anim(&buf); Self { meta: FigureStateMeta { - lantern_offset, + lantern_offset: offsets.lantern, + mountee_offset: offsets.mount_bone, state_time: 0.0, last_ori: Ori::default().into(), lpindex: 0, @@ -5501,12 +5563,13 @@ impl FigureState { ); renderer.update_consts(&mut self.meta.bound.0, &[locals]); - let lantern_offset = anim::compute_matrices(&self.skeleton, mat, buf); + let offsets = anim::compute_matrices(&self.skeleton, mat, buf); let new_bone_consts = figure_bone_data_from_anim(buf); renderer.update_consts(&mut self.meta.bound.1, &new_bone_consts[0..S::BONE_COUNT]); - self.lantern_offset = lantern_offset; + self.lantern_offset = offsets.lantern; + self.mountee_offset = offsets.mount_bone; let smoothing = (5.0 * dt).min(1.0); if let Some(last_pos) = self.last_pos {