seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add interpolate_via_rest static func to Animation class

Browse Source
This commit is contained in:
Silc Lizard (Tokage) Renew
2025-06-12 05:01:00 +09:00
parent ccf414ecb4
commit 4f255fa7d7
4 changed files with 37 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scene/resources/animation.cpp
View File

@ -5674,6 +5674,30 @@ bool Animation::_fetch_compressed_by_index(uint32_t p_compressed_track, int p_in
return false;
}
// Helper functions for Rotation.
double Animation::interpolate_via_rest(double p_from, double p_to, double p_weight, double p_rest) {
double rot_a = Math::fposmod(p_from, Math::TAU);
double rot_b = Math::fposmod(p_to, Math::TAU);
double rot_rest = Math::fposmod(p_rest, Math::TAU);
if (rot_rest < Math::PI) {
rot_a = rot_a > rot_rest + Math::PI ? rot_a - Math::TAU : rot_a;
rot_b = rot_b > rot_rest + Math::PI ? rot_b - Math::TAU : rot_b;
} else {
rot_a = rot_a < rot_rest - Math::PI ? rot_a + Math::TAU : rot_a;
rot_b = rot_b < rot_rest - Math::PI ? rot_b + Math::TAU : rot_b;
}
return Math::fposmod(rot_a + (rot_b - rot_rest) * p_weight, Math::TAU);
}
Quaternion Animation::interpolate_via_rest(const Quaternion &p_from, const Quaternion &p_to, real_t p_weight, const Quaternion &p_rest) {
#ifdef MATH_CHECKS
ERR_FAIL_COND_V_MSG(!p_from.is_normalized(), Quaternion(), "The start quaternion must be normalized.");
ERR_FAIL_COND_V_MSG(!p_to.is_normalized(), Quaternion(), "The end quaternion must be normalized.");
ERR_FAIL_COND_V_MSG(!p_rest.is_normalized(), Quaternion(), "The rest quaternion must be normalized.");
#endif
return (p_from * Quaternion().slerp(p_rest.inverse() * p_to, p_weight)).normalized();
}
// Helper math functions for Variant.
bool Animation::is_variant_interpolatable(const Variant p_value) {
Variant::Type type = p_value.get_type();

4
scene/resources/animation.h
View File

@ -540,6 +540,10 @@ public:
void optimize(real_t p_allowed_velocity_err = 0.01, real_t p_allowed_angular_err = 0.01, int p_precision = 3);
void compress(uint32_t p_page_size = 8192, uint32_t p_fps = 120, float p_split_tolerance = 4.0); // 4.0 seems to be the split tolerance sweet spot from many tests.
// Helper functions for Rotation.
static double interpolate_via_rest(double p_from, double p_to, double p_weight, double p_rest = 0.0); // Deterministic slerp to prevent to cross the inverted rest axis.
static Quaternion interpolate_via_rest(const Quaternion &p_from, const Quaternion &p_to, real_t p_weight, const Quaternion &p_rest = Quaternion()); // Deterministic slerp to prevent to cross the inverted rest axis.
// Helper functions for Variant.
static bool is_variant_interpolatable(const Variant p_value);
static bool validate_type_match(const Variant &p_from, Variant &r_to);