seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove set_axis and get_axis methods from Vector2/2i/3/3i/4/4i

Browse Source
This commit is contained in:
Aaron Franke
2022-09-19 12:49:18 -05:00
parent bcf754d735
commit fd8bd27657
12 changed files with 8 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/math/vector3.cpp
View File

@ -45,16 +45,6 @@ Vector3 Vector3::rotated(const Vector3 &p_axis, const real_t p_angle) const {
return r;
}
void Vector3::set_axis(const int p_axis, const real_t p_value) {
ERR_FAIL_INDEX(p_axis, 3);
coord[p_axis] = p_value;
}
real_t Vector3::get_axis(const int p_axis) const {
ERR_FAIL_INDEX_V(p_axis, 3, 0);
return operator[](p_axis);
}
Vector3 Vector3::clamp(const Vector3 &p_min, const Vector3 &p_max) const {
return Vector3(
CLAMP(x, p_min.x, p_max.x),

3
core/math/vector3.h
View File

@ -68,9 +68,6 @@ struct _NO_DISCARD_ Vector3 {
return coord[p_axis];
}
void set_axis(const int p_axis, const real_t p_value);
real_t get_axis(const int p_axis) const;
_FORCE_INLINE_ void set_all(const real_t p_value) {
x = y = z = p_value;
}

10
core/math/vector3i.cpp
View File

@ -33,16 +33,6 @@
#include "core/math/vector3.h"
#include "core/string/ustring.h"
void Vector3i::set_axis(const int p_axis, const int32_t p_value) {
ERR_FAIL_INDEX(p_axis, 3);
coord[p_axis] = p_value;
}
int32_t Vector3i::get_axis(const int p_axis) const {
ERR_FAIL_INDEX_V(p_axis, 3, 0);
return operator[](p_axis);
}
Vector3i::Axis Vector3i::min_axis_index() const {
return x < y ? (x < z ? Vector3i::AXIS_X : Vector3i::AXIS_Z) : (y < z ? Vector3i::AXIS_Y : Vector3i::AXIS_Z);
}

3
core/math/vector3i.h
View File

@ -64,9 +64,6 @@ struct _NO_DISCARD_ Vector3i {
return coord[p_axis];
}
void set_axis(const int p_axis, const int32_t p_value);
int32_t get_axis(const int p_axis) const;
Vector3i::Axis min_axis_index() const;
Vector3i::Axis max_axis_index() const;

10
core/math/vector4.cpp
View File

@ -33,16 +33,6 @@
#include "core/math/basis.h"
#include "core/string/print_string.h"
void Vector4::set_axis(const int p_axis, const real_t p_value) {
ERR_FAIL_INDEX(p_axis, 4);
components[p_axis] = p_value;
}
real_t Vector4::get_axis(const int p_axis) const {
ERR_FAIL_INDEX_V(p_axis, 4, 0);
return operator[](p_axis);
}
Vector4::Axis Vector4::min_axis_index() const {
uint32_t min_index = 0;
real_t min_value = x;

3
core/math/vector4.h
View File

@ -65,9 +65,6 @@ struct _NO_DISCARD_ Vector4 {
_FORCE_INLINE_ void set_all(const real_t p_value);
void set_axis(const int p_axis, const real_t p_value);
real_t get_axis(const int p_axis) const;
Vector4::Axis min_axis_index() const;
Vector4::Axis max_axis_index() const;

10
core/math/vector4i.cpp
View File

@ -33,16 +33,6 @@
#include "core/math/vector4.h"
#include "core/string/ustring.h"
void Vector4i::set_axis(const int p_axis, const int32_t p_value) {
ERR_FAIL_INDEX(p_axis, 4);
coord[p_axis] = p_value;
}
int32_t Vector4i::get_axis(const int p_axis) const {
ERR_FAIL_INDEX_V(p_axis, 4, 0);
return operator[](p_axis);
}
Vector4i::Axis Vector4i::min_axis_index() const {
uint32_t min_index = 0;
int32_t min_value = x;

3
core/math/vector4i.h
View File

@ -66,9 +66,6 @@ struct _NO_DISCARD_ Vector4i {
return coord[p_axis];
}
void set_axis(const int p_axis, const int32_t p_value);
int32_t get_axis(const int p_axis) const;
Vector4i::Axis min_axis_index() const;
Vector4i::Axis max_axis_index() const;