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

godotengine · Sep 19, 2022 · fd8bd27 · fd8bd27
1 parent bcf754d
commit fd8bd27
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 76 deletions.
diff --git a/core/math/vector3.cpp b/core/math/vector3.cpp
@@ -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),

diff --git a/core/math/vector3.h b/core/math/vector3.h
@@ -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;
 	}

diff --git a/core/math/vector3i.cpp b/core/math/vector3i.cpp
@@ -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);
 }

diff --git a/core/math/vector3i.h b/core/math/vector3i.h
@@ -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;
 

diff --git a/core/math/vector4.cpp b/core/math/vector4.cpp
@@ -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;

diff --git a/core/math/vector4.h b/core/math/vector4.h
@@ -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;
 

diff --git a/core/math/vector4i.cpp b/core/math/vector4i.cpp
@@ -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;

diff --git a/core/math/vector4i.h b/core/math/vector4i.h
@@ -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;
 

diff --git a/tests/core/math/test_vector3.h b/tests/core/math/test_vector3.h
@@ -76,16 +76,12 @@ TEST_CASE("[Vector3] Axis methods") {
 			vector.min_axis_index() == Vector3::Axis::AXIS_X,
 			"Vector3 min_axis_index should work as expected.");
 	CHECK_MESSAGE(
-			vector.get_axis(vector.max_axis_index()) == (real_t)5.6,
-			"Vector3 get_axis should work as expected.");
+			vector[vector.max_axis_index()] == (real_t)5.6,
+			"Vector3 array operator should work as expected.");
 	CHECK_MESSAGE(
 			vector[vector.min_axis_index()] == (real_t)1.2,
 			"Vector3 array operator should work as expected.");
 
-	vector.set_axis(Vector3::Axis::AXIS_Y, 4.7);
-	CHECK_MESSAGE(
-			vector.get_axis(Vector3::Axis::AXIS_Y) == (real_t)4.7,
-			"Vector3 set_axis should work as expected.");
 	vector[Vector3::Axis::AXIS_Y] = 3.7;
 	CHECK_MESSAGE(
 			vector[Vector3::Axis::AXIS_Y] == (real_t)3.7,

diff --git a/tests/core/math/test_vector3i.h b/tests/core/math/test_vector3i.h
@@ -45,16 +45,12 @@ TEST_CASE("[Vector3i] Axis methods") {
 			vector.min_axis_index() == Vector3i::Axis::AXIS_X,
 			"Vector3i min_axis_index should work as expected.");
 	CHECK_MESSAGE(
-			vector.get_axis(vector.max_axis_index()) == 3,
-			"Vector3i get_axis should work as expected.");
+			vector[vector.max_axis_index()] == 3,
+			"Vector3i array operator should work as expected.");
 	CHECK_MESSAGE(
 			vector[vector.min_axis_index()] == 1,
 			"Vector3i array operator should work as expected.");
 
-	vector.set_axis(Vector3i::Axis::AXIS_Y, 4);
-	CHECK_MESSAGE(
-			vector.get_axis(Vector3i::Axis::AXIS_Y) == 4,
-			"Vector3i set_axis should work as expected.");
 	vector[Vector3i::Axis::AXIS_Y] = 5;
 	CHECK_MESSAGE(
 			vector[Vector3i::Axis::AXIS_Y] == 5,

diff --git a/tests/core/math/test_vector4.h b/tests/core/math/test_vector4.h
@@ -47,16 +47,12 @@ TEST_CASE("[Vector4] Axis methods") {
 			vector.min_axis_index() == Vector4::Axis::AXIS_W,
 			"Vector4 min_axis_index should work as expected.");
 	CHECK_MESSAGE(
-			vector.get_axis(vector.max_axis_index()) == (real_t)5.6,
-			"Vector4 get_axis should work as expected.");
+			vector[vector.max_axis_index()] == (real_t)5.6,
+			"Vector4 array operator should work as expected.");
 	CHECK_MESSAGE(
 			vector[vector.min_axis_index()] == (real_t)-0.9,
 			"Vector4 array operator should work as expected.");
 
-	vector.set_axis(Vector4::Axis::AXIS_Y, 4.7);
-	CHECK_MESSAGE(
-			vector.get_axis(Vector4::Axis::AXIS_Y) == (real_t)4.7,
-			"Vector4 set_axis should work as expected.");
 	vector[Vector4::Axis::AXIS_Y] = 3.7;
 	CHECK_MESSAGE(
 			vector[Vector4::Axis::AXIS_Y] == (real_t)3.7,

diff --git a/tests/core/math/test_vector4i.h b/tests/core/math/test_vector4i.h
@@ -45,16 +45,12 @@ TEST_CASE("[Vector4i] Axis methods") {
 			vector.min_axis_index() == Vector4i::Axis::AXIS_X,
 			"Vector4i min_axis_index should work as expected.");
 	CHECK_MESSAGE(
-			vector.get_axis(vector.max_axis_index()) == 4,
-			"Vector4i get_axis should work as expected.");
+			vector[vector.max_axis_index()] == 4,
+			"Vector4i array operator should work as expected.");
 	CHECK_MESSAGE(
 			vector[vector.min_axis_index()] == 1,
 			"Vector4i array operator should work as expected.");
 
-	vector.set_axis(Vector4i::Axis::AXIS_Y, 5);
-	CHECK_MESSAGE(
-			vector.get_axis(Vector4i::Axis::AXIS_Y) == 5,
-			"Vector4i set_axis should work as expected.");
 	vector[Vector4i::Axis::AXIS_Y] = 5;
 	CHECK_MESSAGE(
 			vector[Vector4i::Axis::AXIS_Y] == 5,