summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/egl/egl_manager.h2
-rw-r--r--editor/window_wrapper.cpp2
-rw-r--r--modules/navigation/nav_agent.cpp4
-rw-r--r--tests/core/string/test_node_path.h22
-rw-r--r--tests/core/variant/test_array.h2
5 files changed, 16 insertions, 16 deletions
diff --git a/drivers/egl/egl_manager.h b/drivers/egl/egl_manager.h
index c3a749cd19..61d3289b2d 100644
--- a/drivers/egl/egl_manager.h
+++ b/drivers/egl/egl_manager.h
@@ -45,7 +45,7 @@
class EGLManager {
private:
- // An EGL-side rappresentation of a display with its own rendering
+ // An EGL-side representation of a display with its own rendering
// context.
struct GLDisplay {
void *display = nullptr;
diff --git a/editor/window_wrapper.cpp b/editor/window_wrapper.cpp
index 2d89e4df46..aec4005ce5 100644
--- a/editor/window_wrapper.cpp
+++ b/editor/window_wrapper.cpp
@@ -74,7 +74,7 @@ class ShortcutBin : public Node {
};
Rect2 WindowWrapper::_get_default_window_rect() const {
- // Assume that the control rect is the desidered one for the window.
+ // Assume that the control rect is the desired one for the window.
return wrapped_control->get_screen_rect();
}
diff --git a/modules/navigation/nav_agent.cpp b/modules/navigation/nav_agent.cpp
index cb219ac6c0..5a87ff6c4b 100644
--- a/modules/navigation/nav_agent.cpp
+++ b/modules/navigation/nav_agent.cpp
@@ -326,7 +326,7 @@ const Dictionary NavAgent::get_avoidance_data() const {
_avoidance_data["new_velocity"] = Vector3(rvo_agent_3d.newVelocity_.x(), rvo_agent_3d.newVelocity_.y(), rvo_agent_3d.newVelocity_.z());
_avoidance_data["velocity"] = Vector3(rvo_agent_3d.velocity_.x(), rvo_agent_3d.velocity_.y(), rvo_agent_3d.velocity_.z());
_avoidance_data["position"] = Vector3(rvo_agent_3d.position_.x(), rvo_agent_3d.position_.y(), rvo_agent_3d.position_.z());
- _avoidance_data["prefered_velocity"] = Vector3(rvo_agent_3d.prefVelocity_.x(), rvo_agent_3d.prefVelocity_.y(), rvo_agent_3d.prefVelocity_.z());
+ _avoidance_data["preferred_velocity"] = Vector3(rvo_agent_3d.prefVelocity_.x(), rvo_agent_3d.prefVelocity_.y(), rvo_agent_3d.prefVelocity_.z());
_avoidance_data["radius"] = float(rvo_agent_3d.radius_);
_avoidance_data["time_horizon_agents"] = float(rvo_agent_3d.timeHorizon_);
_avoidance_data["time_horizon_obstacles"] = 0.0;
@@ -341,7 +341,7 @@ const Dictionary NavAgent::get_avoidance_data() const {
_avoidance_data["new_velocity"] = Vector3(rvo_agent_2d.newVelocity_.x(), 0.0, rvo_agent_2d.newVelocity_.y());
_avoidance_data["velocity"] = Vector3(rvo_agent_2d.velocity_.x(), 0.0, rvo_agent_2d.velocity_.y());
_avoidance_data["position"] = Vector3(rvo_agent_2d.position_.x(), 0.0, rvo_agent_2d.position_.y());
- _avoidance_data["prefered_velocity"] = Vector3(rvo_agent_2d.prefVelocity_.x(), 0.0, rvo_agent_2d.prefVelocity_.y());
+ _avoidance_data["preferred_velocity"] = Vector3(rvo_agent_2d.prefVelocity_.x(), 0.0, rvo_agent_2d.prefVelocity_.y());
_avoidance_data["radius"] = float(rvo_agent_2d.radius_);
_avoidance_data["time_horizon_agents"] = float(rvo_agent_2d.timeHorizon_);
_avoidance_data["time_horizon_obstacles"] = float(rvo_agent_2d.timeHorizonObst_);
diff --git a/tests/core/string/test_node_path.h b/tests/core/string/test_node_path.h
index b0c810bb54..031a33c570 100644
--- a/tests/core/string/test_node_path.h
+++ b/tests/core/string/test_node_path.h
@@ -98,44 +98,44 @@ TEST_CASE("[NodePath] Relative path") {
}
TEST_CASE("[NodePath] Absolute path") {
- const NodePath node_path_aboslute = NodePath("/root/Sprite2D");
+ const NodePath node_path_absolute = NodePath("/root/Sprite2D");
CHECK_MESSAGE(
- node_path_aboslute.get_as_property_path() == NodePath(":root/Sprite2D"),
+ node_path_absolute.get_as_property_path() == NodePath(":root/Sprite2D"),
"The returned property path should match the expected value.");
CHECK_MESSAGE(
- node_path_aboslute.get_concatenated_subnames() == "",
+ node_path_absolute.get_concatenated_subnames() == "",
"The returned concatenated subnames should match the expected value.");
CHECK_MESSAGE(
- node_path_aboslute.get_name(0) == "root",
+ node_path_absolute.get_name(0) == "root",
"The returned name at index 0 should match the expected value.");
CHECK_MESSAGE(
- node_path_aboslute.get_name(1) == "Sprite2D",
+ node_path_absolute.get_name(1) == "Sprite2D",
"The returned name at index 1 should match the expected value.");
ERR_PRINT_OFF;
CHECK_MESSAGE(
- node_path_aboslute.get_name(2) == "",
+ node_path_absolute.get_name(2) == "",
"The returned name at invalid index 2 should match the expected value.");
CHECK_MESSAGE(
- node_path_aboslute.get_name(-1) == "",
+ node_path_absolute.get_name(-1) == "",
"The returned name at invalid index -1 should match the expected value.");
ERR_PRINT_ON;
CHECK_MESSAGE(
- node_path_aboslute.get_name_count() == 2,
+ node_path_absolute.get_name_count() == 2,
"The returned number of names should match the expected value.");
CHECK_MESSAGE(
- node_path_aboslute.get_subname_count() == 0,
+ node_path_absolute.get_subname_count() == 0,
"The returned number of subnames should match the expected value.");
CHECK_MESSAGE(
- node_path_aboslute.is_absolute(),
+ node_path_absolute.is_absolute(),
"The node path should be considered absolute.");
CHECK_MESSAGE(
- !node_path_aboslute.is_empty(),
+ !node_path_absolute.is_empty(),
"The node path shouldn't be considered empty.");
}
diff --git a/tests/core/variant/test_array.h b/tests/core/variant/test_array.h
index 228d77b3b5..ea61ae2a02 100644
--- a/tests/core/variant/test_array.h
+++ b/tests/core/variant/test_array.h
@@ -367,7 +367,7 @@ TEST_CASE("[Array] Duplicate recursive array") {
Array a_shallow = a.duplicate(false);
CHECK_EQ(a, a_shallow);
- // Deep copy of recursive array endup with recursion limit and return
+ // Deep copy of recursive array ends up with recursion limit and return
// an invalid result (multiple nested arrays), the point is we should
// not end up with a segfault and an error log should be printed
ERR_PRINT_OFF;