summaryrefslogtreecommitdiffstats
path: root/core/math/transform_3d.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-08-31 13:08:39 +0200
committerGitHub <noreply@github.com>2022-08-31 13:08:39 +0200
commit46a568e0a7d437bcb1c6517d6531f9216d3f832a (patch)
treeec73768e027ba15de8cb320d9d8305d84e7e8c13 /core/math/transform_3d.cpp
parent7b63e5db1e3014b29202293b27ca2d690c13936d (diff)
parentc139d9ef7deb2df51bf7e2dbdd4a312b3f67c97f (diff)
downloadredot-engine-46a568e0a7d437bcb1c6517d6531f9216d3f832a.tar.gz
Merge pull request #65131 from TokageItLab/transform-with
Diffstat (limited to 'core/math/transform_3d.cpp')
-rw-r--r--core/math/transform_3d.cpp13
1 files changed, 1 insertions, 12 deletions
diff --git a/core/math/transform_3d.cpp b/core/math/transform_3d.cpp
index a634faca9a..2de9e81b38 100644
--- a/core/math/transform_3d.cpp
+++ b/core/math/transform_3d.cpp
@@ -94,9 +94,7 @@ void Transform3D::set_look_at(const Vector3 &p_eye, const Vector3 &p_target, con
origin = p_eye;
}
-Transform3D Transform3D::spherical_interpolate_with(const Transform3D &p_transform, real_t p_c) const {
- /* not sure if very "efficient" but good enough? */
-
+Transform3D Transform3D::interpolate_with(const Transform3D &p_transform, real_t p_c) const {
Transform3D interp;
Vector3 src_scale = basis.get_scale();
@@ -113,15 +111,6 @@ Transform3D Transform3D::spherical_interpolate_with(const Transform3D &p_transfo
return interp;
}
-Transform3D Transform3D::interpolate_with(const Transform3D &p_transform, real_t p_c) const {
- Transform3D interp;
-
- interp.basis = basis.lerp(p_transform.basis, p_c);
- interp.origin = origin.lerp(p_transform.origin, p_c);
-
- return interp;
-}
-
void Transform3D::scale(const Vector3 &p_scale) {
basis.scale(p_scale);
origin *= p_scale;