Skip to content

Easing and correct scaling for .anms, custom pivot points #436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
themrdemonized merged 3 commits into from
Feb 18, 2026
Merged

Easing and correct scaling for .anms, custom pivot points #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8a7557
Easing and correct scaling for anms, fix for blend_move_anims+gls
damoldavskiy Feb 17, 2026
fa279da
Changed both script anims and movement layers
damoldavskiy Feb 17, 2026
b16f51b
Pivot bone support
damoldavskiy Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/xrGame/WeaponMagazinedWGrenade.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ void CWeaponMagazinedWGrenade::PlayAnimIdle()

if (m_bGrenadeMode)
{
if (act_state == 0)
if (act_state == 0 || psDeviceFlags2.test(rsBlendMoveAnims))
iAmmoElapsed == 0 && HudAnimationExist("anm_idle_empty_g")
? PlayHUDMotion("anm_idle_empty_g", TRUE, NULL, GetState())
: PlayHUDMotion("anm_idle_g", TRUE, NULL, GetState());
Expand All @@ -879,7 +879,7 @@ void CWeaponMagazinedWGrenade::PlayAnimIdle()
}
else
{
if (act_state == 0)
if (act_state == 0 || psDeviceFlags2.test(rsBlendMoveAnims))
iAmmoElapsed == 0 && HudAnimationExist("anm_idle_empty_w_gl")
? PlayHUDMotion("anm_idle_empty_w_gl", TRUE, NULL, GetState())
: PlayHUDMotion("anm_idle_w_gl", TRUE, NULL, GetState());
Expand Down
4 changes: 2 additions & 2 deletions src/xrGame/level_script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,9 +1546,9 @@ bool AllowHudMotion()
return g_player_hud->allow_script_anim();
}

void PlayBlendAnm(LPCSTR name, u8 part, float speed, float power, bool bLooped, bool no_restart)
void PlayBlendAnm(LPCSTR name, u8 part, float speed, float power, bool bLooped, bool no_restart, LPCSTR pivot_bone)
{
g_player_hud->PlayBlendAnm(name, part, speed, power, bLooped, no_restart);
g_player_hud->PlayBlendAnm(name, part, speed, power, bLooped, no_restart, pivot_bone);
}

void StopBlendAnm(LPCSTR name, bool bForce)
Expand Down
35 changes: 31 additions & 4 deletions src/xrGame/player_hud.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,10 +1224,36 @@ void player_hud::update(const Fmatrix& cam_trans)
Fmatrix blend = anm->XFORM();

if (anm->m_part == 0 || anm->m_part == 2)
m_transform.mulB_43(blend);
{
IKinematics* K = m_model->dcast_PKinematics();
u16 bone_id = K ? K->LL_BoneID(anm->m_pivot_bone) : u16(-1);
if (bone_id != u16(-1))
{
Fmatrix B = K->LL_GetTransform(bone_id);
Fmatrix invB; invB.invert(B);
Fmatrix tmp; tmp.mul_43(B, blend);
tmp.mulB_43(invB);
m_transform.mulB_43(tmp);
}
else
m_transform.mulB_43(blend);
}

if (anm->m_part == 1 || anm->m_part == 2)
m_transform_2.mulB_43(blend);
{
IKinematics* K = m_model_2->dcast_PKinematics();
u16 bone_id = K ? K->LL_BoneID(anm->m_pivot_bone) : u16(-1);
if (bone_id != u16(-1))
{
Fmatrix B = K->LL_GetTransform(bone_id);
Fmatrix invB; invB.invert(B);
Fmatrix tmp; tmp.mul_43(B, blend);
tmp.mulB_43(invB);
m_transform_2.mulB_43(tmp);
}
else
m_transform_2.mulB_43(blend);
}
}

bool need_blend[2];
Expand Down Expand Up @@ -1371,7 +1397,7 @@ void player_hud::updateMovementLayerState()
}
}

void player_hud::PlayBlendAnm(LPCSTR name, u8 part, float speed, float power, bool bLooped, bool no_restart)
void player_hud::PlayBlendAnm(LPCSTR name, u8 part, float speed, float power, bool bLooped, bool no_restart, LPCSTR pivot_bone)
{
for (script_layer* anm : m_script_layers)
{
Expand All @@ -1392,11 +1418,12 @@ void player_hud::PlayBlendAnm(LPCSTR name, u8 part, float speed, float power, bo
anm->anm->Speed() = speed;
anm->m_power = power;
anm->active = true;
anm->m_pivot_bone = pivot_bone;
return;
}
}

script_layer* anm = xr_new<script_layer>(name, part, speed, power, bLooped);
script_layer* anm = xr_new<script_layer>(name, part, speed, power, bLooped, pivot_bone);
m_script_layers.push_back(anm);
}

Expand Down
64 changes: 52 additions & 12 deletions src/xrGame/player_hud.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,31 @@ struct movement_layer

const Fmatrix& XFORM(u8 part)
{
blend.set(anm->XFORM());
blend.mul(blend_amount[part] * m_power);
blend.m[0][0] = 1.f;
blend.m[1][1] = 1.f;
blend.m[2][2] = 1.f;
auto min_jerk_interp = [](float t) {
return 10*t*t*t - 15*t*t*t*t + 6*t*t*t*t*t;
};

float eased = min_jerk_interp(blend_amount[part]);

// Rotation interpolation
Fquaternion qA; qA.identity();
Fquaternion qB; qB.set(anm->XFORM());
{
// Take m_power into account
Fvector axis;
float angle;
if (qB.get_axis_angle(axis, angle)) {
angle *= m_power;
qB.rotation(axis, angle);
}
}
Fquaternion q; q.slerp(qA, qB, eased);

// Translation interpolation
Fvector t = anm->XFORM().c;
t.mul(m_power * eased);

blend.mk_xform(q, t);
return blend;
}
};
Expand All @@ -131,12 +150,14 @@ struct script_layer
bool active;
Fmatrix blend;
u8 m_part;
shared_str m_pivot_bone;

script_layer(LPCSTR name, u8 part, float speed = 1.f, float power = 1.f, bool looped = true)
script_layer(LPCSTR name, u8 part, float speed = 1.f, float power = 1.f, bool looped = true, LPCSTR pivot_bone = nullptr)
{
m_name = name;
m_part = part;
m_power = power;
m_pivot_bone = pivot_bone;
blend.identity();
anm = xr_new<CObjectAnimator>();
anm->Load(name);
Expand Down Expand Up @@ -165,12 +186,31 @@ struct script_layer

const Fmatrix& XFORM()
{
blend.set(anm->XFORM());
blend.mul(blend_amount * m_power);
blend.m[0][0] = 1.f;
blend.m[1][1] = 1.f;
blend.m[2][2] = 1.f;
auto min_jerk_interp = [](float t) {
return 10*t*t*t - 15*t*t*t*t + 6*t*t*t*t*t;
};

float eased = min_jerk_interp(blend_amount);

// Rotation interpolation
Fquaternion qA; qA.identity();
Fquaternion qB; qB.set(anm->XFORM());
{
// Take m_power into account
Fvector axis;
float angle;
if (qB.get_axis_angle(axis, angle)) {
angle *= m_power;
qB.rotation(axis, angle);
}
}
Fquaternion q; q.slerp(qA, qB, eased);

// Translation interpolation
Fvector t = anm->XFORM().c;
t.mul(m_power * eased);

blend.mk_xform(q, t);
return blend;
}
};
Expand Down Expand Up @@ -321,7 +361,7 @@ class player_hud
void update(const Fmatrix& trans);
void updateMovementLayerState();
void StopScriptAnim();
void PlayBlendAnm(LPCSTR name, u8 part = 0, float speed = 1.f, float power = 1.f, bool bLooped = true, bool no_restart = false);
void PlayBlendAnm(LPCSTR name, u8 part = 0, float speed = 1.f, float power = 1.f, bool bLooped = true, bool no_restart = false, LPCSTR pivot_bone = nullptr);
void StopBlendAnm(LPCSTR name, bool bForce = false);
void StopAllBlendAnms(bool bForce);
float SetBlendAnmTime(LPCSTR name, float time);
Expand Down
Loading