diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-19 09:29:57 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-19 09:29:57 +0200 |
| commit | d910b72cb7955068901d24b82066ac2a7a8e640d (patch) | |
| tree | 9f99ed0f6b516a69c0f674fb6c3bc910ad9c6f83 /include | |
| parent | d4cef0bd433e6c724bd1c500ef72d172ff24c801 (diff) | |
| parent | a35994ce7b4844b980155fa2d63c1ed5177339b9 (diff) | |
| download | redot-cpp-d910b72cb7955068901d24b82066ac2a7a8e640d.tar.gz | |
Merge pull request #851 from Zylann/quat_to_quaternion
Use `quaternion` instead of `quat` in method names
Diffstat (limited to 'include')
| -rw-r--r-- | include/godot_cpp/variant/basis.hpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/godot_cpp/variant/basis.hpp b/include/godot_cpp/variant/basis.hpp index ffc9d73..777c9b5 100644 --- a/include/godot_cpp/variant/basis.hpp +++ b/include/godot_cpp/variant/basis.hpp @@ -92,7 +92,7 @@ public: Vector3 get_rotation_euler() const; void get_rotation_axis_angle(Vector3 &p_axis, real_t &p_angle) const; void get_rotation_axis_angle_local(Vector3 &p_axis, real_t &p_angle) const; - Quaternion get_rotation_quat() const; + Quaternion get_rotation_quaternion() const; Vector3 get_rotation() const { return get_rotation_euler(); }; Vector3 rotref_posscale_decomposition(Basis &rotref) const; @@ -115,8 +115,8 @@ public: Vector3 get_euler_zyx() const; void set_euler_zyx(const Vector3 &p_euler); - Quaternion get_quat() const; - void set_quat(const Quaternion &p_quat); + Quaternion get_quaternion() const; + void set_quaternion(const Quaternion &p_quat); Vector3 get_euler() const { return get_euler_yxz(); } void set_euler(const Vector3 &p_euler) { set_euler_yxz(p_euler); } @@ -139,7 +139,7 @@ public: void set_axis_angle_scale(const Vector3 &p_axis, real_t p_phi, const Vector3 &p_scale); void set_euler_scale(const Vector3 &p_euler, const Vector3 &p_scale); - void set_quat_scale(const Quaternion &p_quat, const Vector3 &p_scale); + void set_quaternion_scale(const Quaternion &p_quat, const Vector3 &p_scale); // transposed dot products inline real_t tdotx(const Vector3 &v) const { @@ -247,10 +247,10 @@ public: #endif Basis diagonalize(); - operator Quaternion() const { return get_quat(); } + operator Quaternion() const { return get_quaternion(); } - Basis(const Quaternion &p_quat) { set_quat(p_quat); }; - Basis(const Quaternion &p_quat, const Vector3 &p_scale) { set_quat_scale(p_quat, p_scale); } + Basis(const Quaternion &p_quat) { set_quaternion(p_quat); }; + Basis(const Quaternion &p_quat, const Vector3 &p_scale) { set_quaternion_scale(p_quat, p_scale); } Basis(const Vector3 &p_euler) { set_euler(p_euler); } Basis(const Vector3 &p_euler, const Vector3 &p_scale) { set_euler_scale(p_euler, p_scale); } |