aboutsummaryrefslogtreecommitdiff
path: root/core/math/vector3.h
diff options
context:
space:
mode:
authorRémi Verschelde2017-04-05 01:23:09 +0200
committerGitHub2017-04-05 01:23:09 +0200
commit2c4e4432afca009614ffd5ee837d1578f54eb841 (patch)
tree8c9ed90c4e1be333672002779cd7f5b3151ea622 /core/math/vector3.h
parent7ed83e988930776826b8e6e7cf0c53f8d50cfe26 (diff)
parent1a620bd5faebd83015182ea032f40936a9916af6 (diff)
downloadgodot-2c4e4432afca009614ffd5ee837d1578f54eb841.tar.gz
godot-2c4e4432afca009614ffd5ee837d1578f54eb841.tar.zst
godot-2c4e4432afca009614ffd5ee837d1578f54eb841.zip
Merge pull request #8214 from tagcup/bounce_reflect_slide
Made slide and reflect active verbs acting on itself in Vector2 and V…
Diffstat (limited to '')
-rw-r--r--core/math/vector3.h20
1 files changed, 15 insertions, 5 deletions
diff --git a/core/math/vector3.h b/core/math/vector3.h
index 951380e89..8550ae700 100644
--- a/core/math/vector3.h
+++ b/core/math/vector3.h
@@ -107,6 +107,7 @@ 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;
/* Operators */
@@ -400,14 +401,23 @@ void Vector3::zero() {
x = y = z = 0;
}
-Vector3 Vector3::slide(const Vector3 &p_vec) const {
-
- return p_vec - *this * this->dot(p_vec);
+// slide returns the component of the vector along the given plane, specified by its normal vector.
+Vector3 Vector3::slide(const Vector3 &p_n) const {
+#ifdef DEBUG_ENABLED
+ ERR_FAIL_COND_V(p_n.is_normalized() == false, Vector3());
+#endif
+ return *this - p_n * this->dot(p_n);
}
-Vector3 Vector3::reflect(const Vector3 &p_vec) const {
+Vector3 Vector3::bounce(const Vector3 &p_n) const {
+ return -reflect(p_n);
+}
- return p_vec - *this * this->dot(p_vec) * 2.0;
+Vector3 Vector3::reflect(const Vector3 &p_n) const {
+#ifdef DEBUG_ENABLED
+ ERR_FAIL_COND_V(p_n.is_normalized() == false, Vector3());
+#endif
+ return 2.0 * p_n * this->dot(p_n) - *this;
}
#endif