Commit 340bf6e8 authored by Chaosus's avatar Chaosus Committed by Hein-Pieter van Braam-Stewart
Browse files

Added direction_to method to vectors 


(cherry picked from commit 55f3bd97)
parent 9535a607

core/math/vector2.h

+7 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ struct Vector2 { 
	real_t distance_squared_to(const Vector2 &p_vector2) const;

	real_t angle_to(const Vector2 &p_vector2) const;

	real_t angle_to_point(const Vector2 &p_vector2) const;

	_FORCE_INLINE_ Vector2 direction_to(const Vector2 &p_b) const;



	real_t dot(const Vector2 &p_other) const;

	real_t cross(const Vector2 &p_other) const;
@@ -236,6 +237,12 @@ Vector2 Vector2::slerp(const Vector2 &p_b, real_t p_t) const { 
	return rotated(theta * p_t);

}



Vector2 Vector2::direction_to(const Vector2 &p_b) const {

	Vector2 ret(p_b.x - x, p_b.y - y);

	ret.normalize();

	return ret;

}



Vector2 Vector2::linear_interpolate(const Vector2 &p_a, const Vector2 &p_b, real_t p_t) {



	Vector2 res = p_a;

core/math/vector3.h

+7 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ struct Vector3 { 
	_FORCE_INLINE_ Vector3 project(const Vector3 &p_b) const;



	_FORCE_INLINE_ real_t angle_to(const Vector3 &p_b) const;

	_FORCE_INLINE_ Vector3 direction_to(const Vector3 &p_b) const;



	_FORCE_INLINE_ Vector3 slide(const Vector3 &p_normal) const;

	_FORCE_INLINE_ Vector3 bounce(const Vector3 &p_normal) const;
@@ -244,6 +245,12 @@ real_t Vector3::angle_to(const Vector3 &p_b) const { 
	return Math::atan2(cross(p_b).length(), dot(p_b));

}



Vector3 Vector3::direction_to(const Vector3 &p_b) const {

	Vector3 ret(p_b.x - x, p_b.y - y, p_b.z - z);

	ret.normalize();

	return ret;

}



/* Operators */



Vector3 &Vector3::operator+=(const Vector3 &p_v) {

core/variant_call.cpp

+4 −0
Original line number Diff line number Diff line
@@ -341,6 +341,7 @@ struct _VariantCall { 
	VCALL_LOCALMEM1R(Vector2, project);

	VCALL_LOCALMEM1R(Vector2, angle_to);

	VCALL_LOCALMEM1R(Vector2, angle_to_point);

	VCALL_LOCALMEM1R(Vector2, direction_to);

	VCALL_LOCALMEM2R(Vector2, linear_interpolate);

	VCALL_LOCALMEM2R(Vector2, slerp);

	VCALL_LOCALMEM4R(Vector2, cubic_interpolate);
@@ -397,6 +398,7 @@ struct _VariantCall { 
	VCALL_LOCALMEM1R(Vector3, distance_squared_to);

	VCALL_LOCALMEM1R(Vector3, project);

	VCALL_LOCALMEM1R(Vector3, angle_to);

	VCALL_LOCALMEM1R(Vector3, direction_to);

	VCALL_LOCALMEM1R(Vector3, slide);

	VCALL_LOCALMEM1R(Vector3, bounce);

	VCALL_LOCALMEM1R(Vector3, reflect);
@@ -1554,6 +1556,7 @@ void register_variant_methods() { 
	ADDFUNC0R(VECTOR2, REAL, Vector2, angle, varray());

	ADDFUNC0R(VECTOR2, REAL, Vector2, length_squared, varray());

	ADDFUNC0R(VECTOR2, BOOL, Vector2, is_normalized, varray());

	ADDFUNC1R(VECTOR2, VECTOR2, Vector2, direction_to, VECTOR2, "b", varray());

	ADDFUNC1R(VECTOR2, REAL, Vector2, distance_to, VECTOR2, "to", varray());

	ADDFUNC1R(VECTOR2, REAL, Vector2, distance_squared_to, VECTOR2, "to", varray());

	ADDFUNC1R(VECTOR2, VECTOR2, Vector2, project, VECTOR2, "b", varray());
@@ -1602,6 +1605,7 @@ void register_variant_methods() { 
	ADDFUNC2R(VECTOR3, VECTOR3, Vector3, linear_interpolate, VECTOR3, "b", REAL, "t", varray());

	ADDFUNC2R(VECTOR3, VECTOR3, Vector3, slerp, VECTOR3, "b", REAL, "t", varray());

	ADDFUNC4R(VECTOR3, VECTOR3, Vector3, cubic_interpolate, VECTOR3, "b", VECTOR3, "pre_a", VECTOR3, "post_b", REAL, "t", varray());

	ADDFUNC1R(VECTOR3, VECTOR3, Vector3, direction_to, VECTOR3, "b", varray());

	ADDFUNC1R(VECTOR3, REAL, Vector3, dot, VECTOR3, "b", varray());

	ADDFUNC1R(VECTOR3, VECTOR3, Vector3, cross, VECTOR3, "b", varray());

	ADDFUNC1R(VECTOR3, BASIS, Vector3, outer, VECTOR3, "b", varray());

doc/classes/Vector2.xml

+9 −0
Original line number Diff line number Diff line
@@ -110,6 +110,15 @@ 
				Cubicly interpolates between this vector and [code]b[/code] using [code]pre_a[/code] and [code]post_b[/code] as handles, and returns the result at position [code]t[/code]. [code]t[/code] is in the range of [code]0.0 - 1.0[/code], representing the amount of interpolation.

			</description>

		</method>

		<method name="direction_to">

			<return type="Vector2">

			</return>

			<argument index="0" name="b" type="Vector2">

			</argument>

			<description>

				Returns the normalized vector pointing from this vector to [code]b[/code].

			</description>

		</method>

		<method name="distance_squared_to">

			<return type="float">

			</return>

doc/classes/Vector3.xml

+9 −0
Original line number Diff line number Diff line
@@ -79,6 +79,15 @@ 
				Performs a cubic interpolation between vectors [code]pre_a[/code], [code]a[/code], [code]b[/code], [code]post_b[/code] ([code]a[/code] is current), by the given amount [code]t[/code]. [code]t[/code] is in the range of [code]0.0 - 1.0[/code], representing the amount of interpolation.

			</description>

		</method>

		<method name="direction_to">

			<return type="Vector3">

			</return>

			<argument index="0" name="b" type="Vector3">

			</argument>

			<description>

				Returns the normalized vector pointing from this vector to [code]b[/code].

			</description>

		</method>

		<method name="distance_squared_to">

			<return type="float">

			</return>