diff options
| author | Ferenc Arn | 2017-11-16 21:09:00 -0500 |
|---|---|---|
| committer | Ferenc Arn | 2017-11-17 11:01:41 -0500 |
| commit | d28763a4c1792dc00fde3d151eaea54f9cf2b8a9 (patch) | |
| tree | 7abd311b6e672829bd751fbf4d9135b60f2f9913 /scene/resources/animation.cpp | |
| parent | b44cb4e3b9b573a3cbbd6f71aff81e6c3465d84b (diff) | |
| download | godot-d28763a4c1792dc00fde3d151eaea54f9cf2b8a9.tar.gz godot-d28763a4c1792dc00fde3d151eaea54f9cf2b8a9.tar.zst godot-d28763a4c1792dc00fde3d151eaea54f9cf2b8a9.zip | |
Diffstat (limited to 'scene/resources/animation.cpp')
| -rw-r--r-- | scene/resources/animation.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 21e4a85cd..8192074c1 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -1125,14 +1125,14 @@ Variant Animation::_cubic_interpolate(const Variant &p_pre_a, const Variant &p_a return a.cubic_slerp(b, pa, pb, p_c); } break; - case Variant::RECT3: { + case Variant::AABB: { - Rect3 a = p_a; - Rect3 b = p_b; - Rect3 pa = p_pre_a; - Rect3 pb = p_post_b; + AABB a = p_a; + AABB b = p_b; + AABB pa = p_pre_a; + AABB pb = p_post_b; - return Rect3( + return AABB( a.position.cubic_interpolate(b.position, pa.position, pb.position, p_c), a.size.cubic_interpolate(b.size, pa.size, pb.size, p_c)); } break; |
