summaryrefslogtreecommitdiffstats
path: root/scene/resources/curve.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-09-19 09:05:17 +0200
committerRémi Verschelde <rverschelde@gmail.com>2023-09-19 09:05:17 +0200
commit571cd0eb791b37e9a8adda9f909251138170f6b7 (patch)
tree1f42e937365d7b58dd1dfd9fd8b29c81ef9f7f2d /scene/resources/curve.cpp
parentf0a9931eb750474fef5d44c74327636fc9080d37 (diff)
parent734b9d2379c5ad8511f3a4d020dce60bb18abd88 (diff)
downloadredot-engine-571cd0eb791b37e9a8adda9f909251138170f6b7.tar.gz
Merge pull request #81885 from rmmh/fix-curve3d-twisting
Fix Curve3D baking up vectors for nontrivial curves.
Diffstat (limited to 'scene/resources/curve.cpp')
-rw-r--r--scene/resources/curve.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/curve.cpp b/scene/resources/curve.cpp
index 2e49022c29..258e3e90c3 100644
--- a/scene/resources/curve.cpp
+++ b/scene/resources/curve.cpp
@@ -1662,7 +1662,7 @@ void Curve3D::_bake() const {
const Vector3 *forward_ptr = baked_forward_vector_cache.ptr();
const Vector3 *points_ptr = baked_point_cache.ptr();
- Basis frame; // X-right, Y-up, Z-forward.
+ Basis frame; // X-right, Y-up, -Z-forward.
Basis frame_prev;
// Set the initial frame based on Y-up rule.
@@ -1683,7 +1683,7 @@ void Curve3D::_bake() const {
Vector3 forward = forward_ptr[idx];
Basis rotate;
- rotate.rotate_to_align(frame_prev.get_column(2), forward);
+ rotate.rotate_to_align(-frame_prev.get_column(2), forward);
frame = rotate * frame_prev;
frame.orthonormalize(); // guard against float error accumulation