From 632941e99df4ac4b0a69225a63e678348a4942ee Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 27 Aug 2022 16:41:44 -0400 Subject: [PATCH] Animation for parrying riposte --- .../abilities/sword/parrying_riposte.ron | 6 +- voxygen/anim/src/character/mod.rs | 16 ++-- voxygen/anim/src/character/ripostemelee.rs | 79 +++++++++++++++++++ voxygen/src/scene/figure/mod.rs | 57 ++++--------- 4 files changed, 108 insertions(+), 50 deletions(-) create mode 100644 voxygen/anim/src/character/ripostemelee.rs diff --git a/assets/common/abilities/sword/parrying_riposte.ron b/assets/common/abilities/sword/parrying_riposte.ron index b27b26fff5..2b53e578b7 100644 --- a/assets/common/abilities/sword/parrying_riposte.ron +++ b/assets/common/abilities/sword/parrying_riposte.ron @@ -1,7 +1,7 @@ RiposteMelee( - energy_cost: 0, - buildup_duration: 0.5, - swing_duration: 0.1, + energy_cost: 15, + buildup_duration: 0.3, + swing_duration: 0.15, recover_duration: 0.3, melee_constructor: ( kind: Slash( diff --git a/voxygen/anim/src/character/mod.rs b/voxygen/anim/src/character/mod.rs index a2c4236c21..bf702dd781 100644 --- a/voxygen/anim/src/character/mod.rs +++ b/voxygen/anim/src/character/mod.rs @@ -20,6 +20,7 @@ pub mod leapmelee; pub mod mount; pub mod music; pub mod repeater; +pub mod ripostemelee; pub mod roll; pub mod run; pub mod selfbuff; @@ -48,13 +49,14 @@ pub use self::{ dash::DashAnimation, divemelee::DiveMeleeAnimation, equip::EquipAnimation, finishermelee::FinisherMeleeAnimation, glidewield::GlideWieldAnimation, gliding::GlidingAnimation, idle::IdleAnimation, jump::JumpAnimation, leapmelee::LeapAnimation, - mount::MountAnimation, music::MusicAnimation, repeater::RepeaterAnimation, roll::RollAnimation, - run::RunAnimation, selfbuff::SelfBuffAnimation, shockwave::ShockwaveAnimation, - shoot::ShootAnimation, sit::SitAnimation, sneak::SneakAnimation, - sneakequip::SneakEquipAnimation, sneakwield::SneakWieldAnimation, spin::SpinAnimation, - spinmelee::SpinMeleeAnimation, staggered::StaggeredAnimation, stand::StandAnimation, - stunned::StunnedAnimation, swim::SwimAnimation, swimwield::SwimWieldAnimation, - talk::TalkAnimation, wallrun::WallrunAnimation, wield::WieldAnimation, + mount::MountAnimation, music::MusicAnimation, repeater::RepeaterAnimation, + ripostemelee::RiposteMeleeAnimation, roll::RollAnimation, run::RunAnimation, + selfbuff::SelfBuffAnimation, shockwave::ShockwaveAnimation, shoot::ShootAnimation, + sit::SitAnimation, sneak::SneakAnimation, sneakequip::SneakEquipAnimation, + sneakwield::SneakWieldAnimation, spin::SpinAnimation, spinmelee::SpinMeleeAnimation, + staggered::StaggeredAnimation, stand::StandAnimation, stunned::StunnedAnimation, + swim::SwimAnimation, swimwield::SwimWieldAnimation, talk::TalkAnimation, + wallrun::WallrunAnimation, wield::WieldAnimation, }; use super::{make_bone, vek::*, FigureBoneData, Offsets, Skeleton, TrailSource}; use common::comp; diff --git a/voxygen/anim/src/character/ripostemelee.rs b/voxygen/anim/src/character/ripostemelee.rs new file mode 100644 index 0000000000..fe45c66709 --- /dev/null +++ b/voxygen/anim/src/character/ripostemelee.rs @@ -0,0 +1,79 @@ +use super::{ + super::{vek::*, Animation}, + CharacterSkeleton, SkeletonAttr, +}; +use common::states::utils::StageSection; +use core::f32::consts::PI; + +pub struct RiposteMeleeAnimation; +impl Animation for RiposteMeleeAnimation { + type Dependency<'a> = (Option<&'a str>, Option); + type Skeleton = CharacterSkeleton; + + #[cfg(feature = "use-dyn-lib")] + const UPDATE_FN: &'static [u8] = b"character_riposte_melee\0"; + + #[cfg_attr(feature = "be-dyn-lib", export_name = "character_riposte_melee")] + fn update_skeleton_inner<'a>( + skeleton: &Self::Skeleton, + (ability_id, stage_section): Self::Dependency<'a>, + anim_time: f32, + rate: &mut f32, + s_a: &SkeletonAttr, + ) -> Self::Skeleton { + *rate = 1.0; + let mut next = (*skeleton).clone(); + + next.main.position = Vec3::new(0.0, 0.0, 0.0); + next.main.orientation = Quaternion::rotation_z(0.0); + + match ability_id { + Some("common.abilities.sword.parrying_riposte") => { + let (move1, move2, move3) = match stage_section { + Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0), + Some(StageSection::Action) => (1.0, anim_time.powi(2), 0.0), + Some(StageSection::Recover) => (1.0, 1.0, anim_time.powi(4)), + _ => (0.0, 0.0, 0.0), + }; + + let move2_slow = move2.powi(4); + + next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2); + next.hand_l.orientation = + Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4); + next.hand_r.position = + Vec3::new(-s_a.sc.0 + 6.0 + move1 * -12.0, -4.0 + move1 * 3.0, -2.0); + next.hand_r.orientation = Quaternion::rotation_x(0.9 + move1 * 0.5); + next.control.position = Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2); + next.control.orientation = Quaternion::rotation_x(s_a.sc.3) + * Quaternion::rotation_z(move1 * 1.3 + move2 * -0.7); + + next.chest.orientation = Quaternion::rotation_z(move1 * 0.8); + next.head.orientation = Quaternion::rotation_z(move1 * -0.4); + next.belt.orientation = Quaternion::rotation_z(move1 * -0.2); + next.shorts.orientation = Quaternion::rotation_z(move1 * -0.5); + next.control.orientation.rotate_x(move1 * 0.5); + next.control.orientation.rotate_y(move1 * 2.1); + next.control.orientation.rotate_z(move1 * -0.5); + next.control.position += Vec3::new(0.0, move1 * 5.0, move1 * 8.0); + + next.chest.orientation.rotate_z(move2 * -1.4); + next.head.orientation.rotate_z(move2 * 0.9); + next.belt.orientation.rotate_z(move2 * -0.3); + next.shorts.orientation.rotate_z(move2 * 0.6); + next.control.orientation.rotate_y(move2 * -4.0); + next.control + .orientation + .rotate_z(move2_slow * -3.0 + move2.powf(0.25) * 1.0); + next.control.position += + Vec3::new(move2_slow * 11.0, move2_slow * -4.0, move2_slow * -6.0); + // next.control.orientation.rotate_y(move2.min(0.5) * 2.0 * + // -2.4); next.control.orientation. + // rotate_x((move2.max(0.5) - 0.5) * 2.0 * 1.8); + }, + _ => {}, + } + + next + } +} diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 0284c75444..ad0442ef34 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -2013,49 +2013,26 @@ impl FigureMgr { }, CharacterState::RiposteMelee(s) => { let stage_time = s.timer.as_secs_f32(); - match s.stage_section { + let stage_progress = match s.stage_section { StageSection::Buildup => { - let stage_progress = - stage_time / s.static_data.buildup_duration.as_secs_f32(); - anim::character::BlockAnimation::update_skeleton( - &target_base, - ( - hands, - active_tool_kind, - second_tool_kind, - rel_vel, - ability_id, - Some(StageSection::Buildup), - ), - stage_progress, - &mut state_animation_rate, - skeleton_attr, - ) + stage_time / s.static_data.buildup_duration.as_secs_f32() }, - _ => { - let stage_progress = match s.stage_section { - StageSection::Action => { - stage_time / s.static_data.swing_duration.as_secs_f32() - }, - StageSection::Recover => { - stage_time - / s.static_data.recover_duration.as_secs_f32() - }, - _ => 0.0, - }; - anim::character::AlphaAnimation::update_skeleton( - &target_base, - ( - hands, - Some(s.stage_section), - Some(s.static_data.ability_info), - ), - stage_progress, - &mut state_animation_rate, - skeleton_attr, - ) + StageSection::Action => { + stage_time / s.static_data.swing_duration.as_secs_f32() }, - } + StageSection::Recover => { + stage_time / s.static_data.recover_duration.as_secs_f32() + }, + _ => 0.0, + }; + + anim::character::RiposteMeleeAnimation::update_skeleton( + &target_base, + (ability_id, Some(s.stage_section)), + stage_progress, + &mut state_animation_rate, + skeleton_attr, + ) }, _ => target_base, };