diff options
author | Juan Linietsky <reduzio@gmail.com> | 2017-01-04 01:17:41 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-04 01:17:41 -0300 |
commit | 76c2e8583e70e8c976a306e77a40e8e7226aa249 (patch) | |
tree | fe260ef3c0d00996d537f2fe3b8c78abfb92aa60 /core/math/matrix3.h | |
parent | b085c40edfac45ec1c8b866c789f6e9bab7e5e08 (diff) | |
parent | 3a0c19d3f6ddb26359c95d84c376a8e6b1afd04d (diff) | |
download | redot-engine-76c2e8583e70e8c976a306e77a40e8e7226aa249.tar.gz |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'core/math/matrix3.h')
-rw-r--r-- | core/math/matrix3.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/math/matrix3.h b/core/math/matrix3.h index 2792200b7d..1d967c03b8 100644 --- a/core/math/matrix3.h +++ b/core/math/matrix3.h @@ -91,6 +91,8 @@ public: return elements[0][2] * v[0] + elements[1][2] * v[1] + elements[2][2] * v[2]; } + bool isequal_approx(const Matrix3& a, const Matrix3& b) const; + bool operator==(const Matrix3& p_matrix) const; bool operator!=(const Matrix3& p_matrix) const; @@ -102,6 +104,9 @@ public: int get_orthogonal_index() const; void set_orthogonal_index(int p_index); + bool is_orthogonal() const; + bool is_rotation() const; + operator String() const; void get_axis_and_angle(Vector3 &r_axis,real_t& r_angle) const; |