Browse Source

Discontinued spherical_interpolate_with in Transform3D

Silc Renew 3 years ago
parent
commit
c139d9ef7d

+ 1 - 12
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;

+ 0 - 1
core/math/transform_3d.h

@@ -103,7 +103,6 @@ struct _NO_DISCARD_ Transform3D {
 	void operator*=(const real_t p_val);
 	Transform3D operator*(const real_t p_val) const;
 
-	Transform3D spherical_interpolate_with(const Transform3D &p_transform, real_t p_c) const;
 	Transform3D interpolate_with(const Transform3D &p_transform, real_t p_c) const;
 
 	_FORCE_INLINE_ Transform3D inverse_xform(const Transform3D &t) const {

+ 0 - 1
core/variant/variant_call.cpp

@@ -1969,7 +1969,6 @@ static void _register_variant_builtin_methods() {
 	bind_method(Transform3D, translated, sarray("offset"), varray());
 	bind_method(Transform3D, translated_local, sarray("offset"), varray());
 	bind_method(Transform3D, looking_at, sarray("target", "up"), varray(Vector3(0, 1, 0)));
-	bind_method(Transform3D, spherical_interpolate_with, sarray("xform", "weight"), varray());
 	bind_method(Transform3D, interpolate_with, sarray("xform", "weight"), varray());
 	bind_method(Transform3D, is_equal_approx, sarray("xform"), varray());
 

+ 0 - 8
doc/classes/Transform3D.xml

@@ -141,14 +141,6 @@
 				This can be seen as transforming with respect to the local frame.
 			</description>
 		</method>
-		<method name="spherical_interpolate_with" qualifiers="const">
-			<return type="Transform3D" />
-			<param index="0" name="xform" type="Transform3D" />
-			<param index="1" name="weight" type="float" />
-			<description>
-				Returns a transform spherically interpolated between this transform and another by a given [param weight] (on the range of 0.0 to 1.0).
-			</description>
-		</method>
 		<method name="translated" qualifiers="const">
 			<return type="Transform3D" />
 			<param index="0" name="offset" type="Vector3" />