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

Fix `tween_property` on "Basis" to properly update its value 

(cherry picked from commit eb7f87e9a8)
This commit is contained in:
Septian 2023-07-13 23:07:23 +07:00 committed by Yuri Sizov
parent 085b16b1bb
commit a6b1c0edbb
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(); const ::AABB ab = b.operator ::AABB();
return ::AABB(aa.position + ab.position, aa.size + ab.size); return ::AABB(aa.position + ab.position, aa.size + ab.size);
} }
case Variant::BASIS: {
return (a.operator Basis()) * (b.operator Basis());
}
case Variant::QUATERNION: { case Variant::QUATERNION: {
return (a.operator Quaternion()) * (b.operator 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(); const ::AABB ab = b.operator ::AABB();
return ::AABB(aa.position - ab.position, aa.size - ab.size); return ::AABB(aa.position - ab.position, aa.size - ab.size);
} }
case Variant::BASIS: {
return (b.operator Basis()).inverse() * (a.operator Basis());
}
case Variant::QUATERNION: { case Variant::QUATERNION: {
return (b.operator Quaternion()).inverse() * (a.operator Quaternion()); return (b.operator Quaternion()).inverse() * (a.operator Quaternion());
} }