diff options
| author | TwistedTwigleg | 2017-08-11 15:10:05 -0400 |
|---|---|---|
| committer | Rémi Verschelde | 2017-08-16 17:22:23 +0200 |
| commit | 00f6c859282bb4dab3f6b4f6c20c44222221ebe9 (patch) | |
| tree | ab3d2bae1ce8e9661480535a6442c94e5aeafd83 /core/math/vector3.h | |
| parent | b1ecaaa22b8dd87a75db414cb84ad0f60d5d4cef (diff) | |
| download | godot-00f6c859282bb4dab3f6b4f6c20c44222221ebe9.tar.gz godot-00f6c859282bb4dab3f6b4f6c20c44222221ebe9.tar.zst godot-00f6c859282bb4dab3f6b4f6c20c44222221ebe9.zip | |
Diffstat (limited to 'core/math/vector3.h')
| -rw-r--r-- | core/math/vector3.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/core/math/vector3.h b/core/math/vector3.h index 6a7974681..c58a86fbd 100644 --- a/core/math/vector3.h +++ b/core/math/vector3.h @@ -108,9 +108,9 @@ struct Vector3 { _FORCE_INLINE_ real_t angle_to(const Vector3 &p_b) const; - _FORCE_INLINE_ Vector3 slide(const Vector3 &p_vec) const; - _FORCE_INLINE_ Vector3 bounce(const Vector3 &p_vec) const; - _FORCE_INLINE_ Vector3 reflect(const Vector3 &p_vec) const; + _FORCE_INLINE_ Vector3 slide(const Vector3 &p_normal) const; + _FORCE_INLINE_ Vector3 bounce(const Vector3 &p_normal) const; + _FORCE_INLINE_ Vector3 reflect(const Vector3 &p_normal) const; /* Operators */ @@ -410,22 +410,22 @@ void Vector3::zero() { } // slide returns the component of the vector along the given plane, specified by its normal vector. -Vector3 Vector3::slide(const Vector3 &p_n) const { +Vector3 Vector3::slide(const Vector3 &p_normal) const { #ifdef MATH_CHECKS - ERR_FAIL_COND_V(p_n.is_normalized() == false, Vector3()); + ERR_FAIL_COND_V(p_normal.is_normalized() == false, Vector3()); #endif - return *this - p_n * this->dot(p_n); + return *this - p_normal * this->dot(p_normal); } -Vector3 Vector3::bounce(const Vector3 &p_n) const { - return -reflect(p_n); +Vector3 Vector3::bounce(const Vector3 &p_normal) const { + return -reflect(p_normal); } -Vector3 Vector3::reflect(const Vector3 &p_n) const { +Vector3 Vector3::reflect(const Vector3 &p_normal) const { #ifdef MATH_CHECKS - ERR_FAIL_COND_V(p_n.is_normalized() == false, Vector3()); + ERR_FAIL_COND_V(p_normal.is_normalized() == false, Vector3()); #endif - return 2.0 * p_n * this->dot(p_n) - *this; + return 2.0 * p_normal * this->dot(p_normal) - *this; } #endif |
