summaryrefslogtreecommitdiffstats
path: root/core/math/basis.h
diff options
context:
space:
mode:
Diffstat (limited to 'core/math/basis.h')
-rw-r--r--core/math/basis.h84
1 files changed, 42 insertions, 42 deletions
diff --git a/core/math/basis.h b/core/math/basis.h
index e3094114e8..1fc08e95e1 100644
--- a/core/math/basis.h
+++ b/core/math/basis.h
@@ -41,11 +41,11 @@ struct _NO_DISCARD_ Basis {
Vector3(0, 0, 1)
};
- _FORCE_INLINE_ const Vector3 &operator[](int axis) const {
- return rows[axis];
+ _FORCE_INLINE_ const Vector3 &operator[](int p_axis) const {
+ return rows[p_axis];
}
- _FORCE_INLINE_ Vector3 &operator[](int axis) {
- return rows[axis];
+ _FORCE_INLINE_ Vector3 &operator[](int p_axis) {
+ return rows[p_axis];
}
void invert();
@@ -110,14 +110,14 @@ struct _NO_DISCARD_ Basis {
void set_quaternion_scale(const Quaternion &p_quaternion, const Vector3 &p_scale);
// transposed dot products
- _FORCE_INLINE_ real_t tdotx(const Vector3 &v) const {
- return rows[0][0] * v[0] + rows[1][0] * v[1] + rows[2][0] * v[2];
+ _FORCE_INLINE_ real_t tdotx(const Vector3 &p_v) const {
+ return rows[0][0] * p_v[0] + rows[1][0] * p_v[1] + rows[2][0] * p_v[2];
}
- _FORCE_INLINE_ real_t tdoty(const Vector3 &v) const {
- return rows[0][1] * v[0] + rows[1][1] * v[1] + rows[2][1] * v[2];
+ _FORCE_INLINE_ real_t tdoty(const Vector3 &p_v) const {
+ return rows[0][1] * p_v[0] + rows[1][1] * p_v[1] + rows[2][1] * p_v[2];
}
- _FORCE_INLINE_ real_t tdotz(const Vector3 &v) const {
- return rows[0][2] * v[0] + rows[1][2] * v[1] + rows[2][2] * v[2];
+ _FORCE_INLINE_ real_t tdotz(const Vector3 &p_v) const {
+ return rows[0][2] * p_v[0] + rows[1][2] * p_v[1] + rows[2][2] * p_v[2];
}
bool is_equal_approx(const Basis &p_basis) const;
@@ -134,10 +134,10 @@ struct _NO_DISCARD_ Basis {
_FORCE_INLINE_ Basis operator+(const Basis &p_matrix) const;
_FORCE_INLINE_ void operator-=(const Basis &p_matrix);
_FORCE_INLINE_ Basis operator-(const Basis &p_matrix) const;
- _FORCE_INLINE_ void operator*=(const real_t p_val);
- _FORCE_INLINE_ Basis operator*(const real_t p_val) const;
- _FORCE_INLINE_ void operator/=(const real_t p_val);
- _FORCE_INLINE_ Basis operator/(const real_t p_val) const;
+ _FORCE_INLINE_ void operator*=(real_t p_val);
+ _FORCE_INLINE_ Basis operator*(real_t p_val) const;
+ _FORCE_INLINE_ void operator/=(real_t p_val);
+ _FORCE_INLINE_ Basis operator/(real_t p_val) const;
bool is_orthogonal() const;
bool is_orthonormal() const;
@@ -145,24 +145,24 @@ struct _NO_DISCARD_ Basis {
bool is_diagonal() const;
bool is_rotation() const;
- Basis lerp(const Basis &p_to, const real_t &p_weight) const;
- Basis slerp(const Basis &p_to, const real_t &p_weight) const;
+ Basis lerp(const Basis &p_to, real_t p_weight) const;
+ Basis slerp(const Basis &p_to, real_t p_weight) const;
void rotate_sh(real_t *p_values);
operator String() const;
/* create / set */
- _FORCE_INLINE_ void set(real_t xx, real_t xy, real_t xz, real_t yx, real_t yy, real_t yz, real_t zx, real_t zy, real_t zz) {
- rows[0][0] = xx;
- rows[0][1] = xy;
- rows[0][2] = xz;
- rows[1][0] = yx;
- rows[1][1] = yy;
- rows[1][2] = yz;
- rows[2][0] = zx;
- rows[2][1] = zy;
- rows[2][2] = zz;
+ _FORCE_INLINE_ void set(real_t p_xx, real_t p_xy, real_t p_xz, real_t p_yx, real_t p_yy, real_t p_yz, real_t p_zx, real_t p_zy, real_t p_zz) {
+ rows[0][0] = p_xx;
+ rows[0][1] = p_xy;
+ rows[0][2] = p_xz;
+ rows[1][0] = p_yx;
+ rows[1][1] = p_yy;
+ rows[1][2] = p_yz;
+ rows[2][0] = p_zx;
+ rows[2][1] = p_zy;
+ rows[2][2] = p_zz;
}
_FORCE_INLINE_ void set_columns(const Vector3 &p_x, const Vector3 &p_y, const Vector3 &p_z) {
set_column(0, p_x);
@@ -192,20 +192,20 @@ struct _NO_DISCARD_ Basis {
rows[2].zero();
}
- _FORCE_INLINE_ Basis transpose_xform(const Basis &m) const {
+ _FORCE_INLINE_ Basis transpose_xform(const Basis &p_m) const {
return Basis(
- rows[0].x * m[0].x + rows[1].x * m[1].x + rows[2].x * m[2].x,
- rows[0].x * m[0].y + rows[1].x * m[1].y + rows[2].x * m[2].y,
- rows[0].x * m[0].z + rows[1].x * m[1].z + rows[2].x * m[2].z,
- rows[0].y * m[0].x + rows[1].y * m[1].x + rows[2].y * m[2].x,
- rows[0].y * m[0].y + rows[1].y * m[1].y + rows[2].y * m[2].y,
- rows[0].y * m[0].z + rows[1].y * m[1].z + rows[2].y * m[2].z,
- rows[0].z * m[0].x + rows[1].z * m[1].x + rows[2].z * m[2].x,
- rows[0].z * m[0].y + rows[1].z * m[1].y + rows[2].z * m[2].y,
- rows[0].z * m[0].z + rows[1].z * m[1].z + rows[2].z * m[2].z);
+ rows[0].x * p_m[0].x + rows[1].x * p_m[1].x + rows[2].x * p_m[2].x,
+ rows[0].x * p_m[0].y + rows[1].x * p_m[1].y + rows[2].x * p_m[2].y,
+ rows[0].x * p_m[0].z + rows[1].x * p_m[1].z + rows[2].x * p_m[2].z,
+ rows[0].y * p_m[0].x + rows[1].y * p_m[1].x + rows[2].y * p_m[2].x,
+ rows[0].y * p_m[0].y + rows[1].y * p_m[1].y + rows[2].y * p_m[2].y,
+ rows[0].y * p_m[0].z + rows[1].y * p_m[1].z + rows[2].y * p_m[2].z,
+ rows[0].z * p_m[0].x + rows[1].z * p_m[1].x + rows[2].z * p_m[2].x,
+ rows[0].z * p_m[0].y + rows[1].z * p_m[1].y + rows[2].z * p_m[2].y,
+ rows[0].z * p_m[0].z + rows[1].z * p_m[1].z + rows[2].z * p_m[2].z);
}
- Basis(real_t xx, real_t xy, real_t xz, real_t yx, real_t yy, real_t yz, real_t zx, real_t zy, real_t zz) {
- set(xx, xy, xz, yx, yy, yz, zx, zy, zz);
+ Basis(real_t p_xx, real_t p_xy, real_t p_xz, real_t p_yx, real_t p_yy, real_t p_yz, real_t p_zx, real_t p_zy, real_t p_zz) {
+ set(p_xx, p_xy, p_xz, p_yx, p_yy, p_yz, p_zx, p_zy, p_zz);
}
void orthonormalize();
@@ -279,25 +279,25 @@ _FORCE_INLINE_ Basis Basis::operator-(const Basis &p_matrix) const {
return ret;
}
-_FORCE_INLINE_ void Basis::operator*=(const real_t p_val) {
+_FORCE_INLINE_ void Basis::operator*=(real_t p_val) {
rows[0] *= p_val;
rows[1] *= p_val;
rows[2] *= p_val;
}
-_FORCE_INLINE_ Basis Basis::operator*(const real_t p_val) const {
+_FORCE_INLINE_ Basis Basis::operator*(real_t p_val) const {
Basis ret(*this);
ret *= p_val;
return ret;
}
-_FORCE_INLINE_ void Basis::operator/=(const real_t p_val) {
+_FORCE_INLINE_ void Basis::operator/=(real_t p_val) {
rows[0] /= p_val;
rows[1] /= p_val;
rows[2] /= p_val;
}
-_FORCE_INLINE_ Basis Basis::operator/(const real_t p_val) const {
+_FORCE_INLINE_ Basis Basis::operator/(real_t p_val) const {
Basis ret(*this);
ret /= p_val;
return ret;