summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Guiocheau <florent.guiocheau@gmail.com>2024-10-14 21:45:17 +0200
committerDavid Snopek <dsnopek@gmail.com>2024-10-28 16:32:13 -0500
commit94d74979cede0a18e66040ae58834b1cc16d18f2 (patch)
tree6a65bec8d14de9240017d8c9f764f16cc4412178
parentbf26191ead2680fc59c51ffd60236627e4b606e6 (diff)
downloadredot-cpp-94d74979cede0a18e66040ae58834b1cc16d18f2.tar.gz
Add p_use_model_front to Basis::looking_at()
(cherry picked from commit 02fd535454773edb1a8c4b52d5b851e863660246)
-rw-r--r--include/godot_cpp/variant/basis.hpp2
-rw-r--r--src/variant/basis.cpp7
2 files changed, 6 insertions, 3 deletions
diff --git a/include/godot_cpp/variant/basis.hpp b/include/godot_cpp/variant/basis.hpp
index e740a64..f3ebe15 100644
--- a/include/godot_cpp/variant/basis.hpp
+++ b/include/godot_cpp/variant/basis.hpp
@@ -224,7 +224,7 @@ struct _NO_DISCARD_ Basis {
operator Quaternion() const { return get_quaternion(); }
- static Basis looking_at(const Vector3 &p_target, const Vector3 &p_up = Vector3(0, 1, 0));
+ static Basis looking_at(const Vector3 &p_target, const Vector3 &p_up = Vector3(0, 1, 0), bool p_use_model_front = false);
Basis(const Quaternion &p_quaternion) { set_quaternion(p_quaternion); }
Basis(const Quaternion &p_quaternion, const Vector3 &p_scale) { set_quaternion_scale(p_quaternion, p_scale); }
diff --git a/src/variant/basis.cpp b/src/variant/basis.cpp
index 200cd06..d8a9919 100644
--- a/src/variant/basis.cpp
+++ b/src/variant/basis.cpp
@@ -1037,12 +1037,15 @@ void Basis::rotate_sh(real_t *p_values) {
p_values[8] = d4 * s_scale_dst4;
}
-Basis Basis::looking_at(const Vector3 &p_target, const Vector3 &p_up) {
+Basis Basis::looking_at(const Vector3 &p_target, const Vector3 &p_up, bool p_use_model_front) {
#ifdef MATH_CHECKS
ERR_FAIL_COND_V_MSG(p_target.is_zero_approx(), Basis(), "The target vector can't be zero.");
ERR_FAIL_COND_V_MSG(p_up.is_zero_approx(), Basis(), "The up vector can't be zero.");
#endif
- Vector3 v_z = -p_target.normalized();
+ Vector3 v_z = p_target.normalized();
+ if (!p_use_model_front) {
+ v_z = -v_z;
+ }
Vector3 v_x = p_up.cross(v_z);
#ifdef MATH_CHECKS
ERR_FAIL_COND_V_MSG(v_x.is_zero_approx(), Basis(), "The target vector and up vector can't be parallel to each other.");