summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-06-05 13:32:08 +0200
committerGitHub <noreply@github.com>2021-06-05 13:32:08 +0200
commit6f7d45d2109246e3888fc2b16136915e6fec89fd (patch)
treece03eee0b483c299863927e7c75390dead4d9540 /tests
parent537d8899e9cb97b2ba0b154496dcdd295163c4bd (diff)
parent8acd13a456050ded00f0f264ff0aa91a304f6c54 (diff)
Merge pull request #45364 from madmiraal/rename-quat
Rename Quat to Quaternion
Diffstat (limited to 'tests')
-rw-r--r--tests/test_class_db.h2
-rw-r--r--tests/test_macros.h2
-rw-r--r--tests/test_math.cpp8
-rw-r--r--tests/test_validate_testing.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/test_class_db.h b/tests/test_class_db.h
index 1e88792a85..17f9baab85 100644
--- a/tests/test_class_db.h
+++ b/tests/test_class_db.h
@@ -243,7 +243,7 @@ bool arg_default_value_is_assignable_to_type(const Context &p_context, const Var
case Variant::TRANSFORM3D:
case Variant::TRANSFORM2D:
case Variant::BASIS:
- case Variant::QUAT:
+ case Variant::QUATERNION:
case Variant::PLANE:
case Variant::AABB:
case Variant::COLOR:
diff --git a/tests/test_macros.h b/tests/test_macros.h
index 8e4a78de1f..a1f1932db4 100644
--- a/tests/test_macros.h
+++ b/tests/test_macros.h
@@ -91,7 +91,7 @@ DOCTEST_STRINGIFY_VARIANT(Vector3);
DOCTEST_STRINGIFY_VARIANT(Vector3i);
DOCTEST_STRINGIFY_VARIANT(Transform2D);
DOCTEST_STRINGIFY_VARIANT(Plane);
-DOCTEST_STRINGIFY_VARIANT(Quat);
+DOCTEST_STRINGIFY_VARIANT(Quaternion);
DOCTEST_STRINGIFY_VARIANT(AABB);
DOCTEST_STRINGIFY_VARIANT(Basis);
DOCTEST_STRINGIFY_VARIANT(Transform3D);
diff --git a/tests/test_math.cpp b/tests/test_math.cpp
index aae8ce08e8..7f2097699a 100644
--- a/tests/test_math.cpp
+++ b/tests/test_math.cpp
@@ -599,13 +599,13 @@ MainLoop *test() {
Basis m2(v2, a2);
- Quat q = m;
- Quat q2 = m2;
+ Quaternion q = m;
+ Quaternion q2 = m2;
Basis m3 = m.inverse() * m2;
- Quat q3 = (q.inverse() * q2); //.normalized();
+ Quaternion q3 = (q.inverse() * q2); //.normalized();
- print_line(Quat(m3));
+ print_line(Quaternion(m3));
print_line(q3);
print_line("before v: " + v + " a: " + rtos(a));
diff --git a/tests/test_validate_testing.h b/tests/test_validate_testing.h
index 608008f531..f301047509 100644
--- a/tests/test_validate_testing.h
+++ b/tests/test_validate_testing.h
@@ -84,7 +84,7 @@ TEST_SUITE("Validate tests") {
Plane plane(Vector3(1, 1, 1), 1.0);
INFO(plane);
- Quat quat(Vector3(0.5, 1.0, 2.0));
+ Quaternion quat(Vector3(0.5, 1.0, 2.0));
INFO(quat);
AABB aabb(Vector3(), Vector3(100, 100, 100));