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

Animation for parrying riposte

Browse Source
This commit is contained in:
Sam 2022-08-27 16:41:44 -04:00
parent 7c22847009
commit 632941e99d
4 changed files with 108 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/common/abilities/sword/parrying_riposte.ron
View File

@ -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(

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

@ -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;

79
voxygen/anim/src/character/ripostemelee.rs Normal file
View File

@ -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<StageSection>);
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
}
}

57
voxygen/src/scene/figure/mod.rs
View File

@ -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,
};