summaryrefslogtreecommitdiff
path: root/core/math/matrix3.cpp
diff options
context:
space:
mode:
authortagcup <tagcup@yahoo.com>2018-05-16 20:32:35 -0400
committertagcup <tagcup@yahoo.com>2018-05-17 19:39:04 -0400
commit1bba6eeeb9f0898308e5b96f6f996c2fbabe55ee (patch)
treeaad72201537119f20810b0e04a7b215a60731586 /core/math/matrix3.cpp
parentba134d44b8a5d87cf3694dd8858ec2a495bf6c11 (diff)
Removed incorrect Basis::set_scale().
Also added a missing constructor in Basis, and fixed usage of inverse and affine inverse in Transform.
Diffstat (limited to 'core/math/matrix3.cpp')
-rw-r--r--core/math/matrix3.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/core/math/matrix3.cpp b/core/math/matrix3.cpp
index 8ee8ccb457..e13297ace2 100644
--- a/core/math/matrix3.cpp
+++ b/core/math/matrix3.cpp
@@ -242,18 +242,11 @@ void Basis::scale_local(const Vector3 &p_scale) {
Basis Basis::scaled_local(const Vector3 &p_scale) const {
Basis b;
- b.set_scale(p_scale);
+ b.set_diagonal(p_scale);
return (*this) * b;
}
-void Basis::set_scale(const Vector3 &p_scale) {
-
- set_axis(0, get_axis(0).normalized() * p_scale.x);
- set_axis(1, get_axis(1).normalized() * p_scale.y);
- set_axis(2, get_axis(2).normalized() * p_scale.z);
-}
-
Vector3 Basis::get_scale_abs() const {
return Vector3(