gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-10-14 15:20:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #79426 from sepTN/fix-basis-tweening

Browse source 
Fix `tween_property` on "Basis" to properly update its value
This commit is contained in:
Yuri Sizov 2023-07-14 18:50:12 +02:00
parent ac16c2696e eb7f87e9a8
commit 16565fb630
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/resources/animation.cpp
View file

@ -5508,6 +5508,9 @@ Variant Animation::add_variant(const Variant &a, const Variant &b) {
const ::AABB ab = b.operator ::AABB();
return ::AABB(aa.position + ab.position, aa.size + ab.size);
}
case Variant::BASIS: {
return (a.operator Basis()) * (b.operator Basis());
}
case Variant::QUATERNION: {
return (a.operator Quaternion()) * (b.operator Quaternion());
}
@ -5555,6 +5558,9 @@ Variant Animation::subtract_variant(const Variant &a, const Variant &b) {
const ::AABB ab = b.operator ::AABB();
return ::AABB(aa.position - ab.position, aa.size - ab.size);
}
case Variant::BASIS: {
return (b.operator Basis()).inverse() * (a.operator Basis());
}
case Variant::QUATERNION: {
return (b.operator Quaternion()).inverse() * (a.operator Quaternion());
}