summaryrefslogtreecommitdiffstats
path: root/core/math/basis.h
diff options
context:
space:
mode:
authorAaron Franke <arnfranke@yahoo.com>2021-09-06 15:39:01 -0500
committerAaron Franke <arnfranke@yahoo.com>2021-09-17 10:30:30 -0500
commitbf0213470cbfa63bbcce9f614f2cc2ecaae5fe54 (patch)
treede434807afe988d3c96019797c86f3e82920fa1f /core/math/basis.h
parentb8fdeb64678444103a9b6c96ef3ae2c65ad02b2f (diff)
downloadredot-engine-bf0213470cbfa63bbcce9f614f2cc2ecaae5fe54.tar.gz
Replace Vector3.to_diagonal_matrix with Basis.from_scale
Diffstat (limited to 'core/math/basis.h')
-rw-r--r--core/math/basis.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/math/basis.h b/core/math/basis.h
index 9d8ed16e29..eb107d7e4e 100644
--- a/core/math/basis.h
+++ b/core/math/basis.h
@@ -35,6 +35,9 @@
#include "core/math/vector3.h"
class Basis {
+private:
+ void _set_diagonal(const Vector3 &p_diag);
+
public:
Vector3 elements[3] = {
Vector3(1, 0, 0),
@@ -166,8 +169,6 @@ public:
int get_orthogonal_index() const;
void set_orthogonal_index(int p_index);
- void set_diagonal(const Vector3 &p_diag);
-
bool is_orthogonal() const;
bool is_diagonal() const;
bool is_rotation() const;
@@ -254,6 +255,7 @@ public:
Basis(const Vector3 &p_axis, real_t p_phi) { set_axis_angle(p_axis, p_phi); }
Basis(const Vector3 &p_axis, real_t p_phi, const Vector3 &p_scale) { set_axis_angle_scale(p_axis, p_phi, p_scale); }
+ static Basis from_scale(const Vector3 &p_scale);
_FORCE_INLINE_ Basis(const Vector3 &row0, const Vector3 &row1, const Vector3 &row2) {
elements[0] = row0;