summaryrefslogtreecommitdiff
path: root/servers/physics
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-03-24 21:45:31 +0100
committerRémi Verschelde <rverschelde@gmail.com>2017-03-24 21:45:31 +0100
commitdebeee56f721178d44f71deb4e303b825d1dccd1 (patch)
tree6c88f378419a5760bbe919c48c87d1c71a6ea548 /servers/physics
parentc103f32ea3b19c3588d54dcef98e307f8b823f4c (diff)
Fix typos in source code using codespell
From https://github.com/lucasdemarchi/codespell
Diffstat (limited to 'servers/physics')
-rw-r--r--servers/physics/body_sw.cpp2
-rw-r--r--servers/physics/gjk_epa.cpp2
-rw-r--r--servers/physics/joints/generic_6dof_joint_sw.h2
-rw-r--r--servers/physics/physics_server_sw.cpp2
-rw-r--r--servers/physics/space_sw.cpp4
5 files changed, 6 insertions, 6 deletions
diff --git a/servers/physics/body_sw.cpp b/servers/physics/body_sw.cpp
index a4fc694f67..6b43ec31aa 100644
--- a/servers/physics/body_sw.cpp
+++ b/servers/physics/body_sw.cpp
@@ -503,7 +503,7 @@ void BodySW::integrate_forces(real_t p_step) {
} else {
if (!omit_force_integration && !first_integration) {
- //overriden by direct state query
+ //overridden by direct state query
Vector3 force = gravity * mass;
force += applied_force;
diff --git a/servers/physics/gjk_epa.cpp b/servers/physics/gjk_epa.cpp
index f65e6768ab..2c5610ee89 100644
--- a/servers/physics/gjk_epa.cpp
+++ b/servers/physics/gjk_epa.cpp
@@ -58,7 +58,7 @@ namespace GjkEpa2 {
struct sResults {
enum eStatus {
- Separated, /* Shapes doesnt penetrate */
+ Separated, /* Shapes doesn't penetrate */
Penetrating, /* Shapes are penetrating */
GJK_Failed, /* GJK phase fail, no big issue, shapes are probably just 'touching' */
EPA_Failed /* EPA phase fail, bigger problem, need to save parameters, and debug */
diff --git a/servers/physics/joints/generic_6dof_joint_sw.h b/servers/physics/joints/generic_6dof_joint_sw.h
index 87245c6ffe..bd9a1e5f0e 100644
--- a/servers/physics/joints/generic_6dof_joint_sw.h
+++ b/servers/physics/joints/generic_6dof_joint_sw.h
@@ -237,7 +237,7 @@ protected:
Vector3 m_calculatedAxisAngleDiff;
Vector3 m_calculatedAxis[3];
- Vector3 m_AnchorPos; // point betwen pivots of bodies A and B to solve linear axes
+ Vector3 m_AnchorPos; // point between pivots of bodies A and B to solve linear axes
bool m_useLinearReferenceFrameA;
diff --git a/servers/physics/physics_server_sw.cpp b/servers/physics/physics_server_sw.cpp
index 37be0a8a1c..6fc983a739 100644
--- a/servers/physics/physics_server_sw.cpp
+++ b/servers/physics/physics_server_sw.cpp
@@ -181,7 +181,7 @@ PhysicsDirectSpaceState *PhysicsServerSW::space_get_direct_state(RID p_space) {
ERR_FAIL_COND_V(!space, NULL);
if (!doing_sync || space->is_locked()) {
- ERR_EXPLAIN("Space state is inaccesible right now, wait for iteration or fixed process notification.");
+ ERR_EXPLAIN("Space state is inaccessible right now, wait for iteration or fixed process notification.");
ERR_FAIL_V(NULL);
}
diff --git a/servers/physics/space_sw.cpp b/servers/physics/space_sw.cpp
index 603c6fa3c4..2043f9fed8 100644
--- a/servers/physics/space_sw.cpp
+++ b/servers/physics/space_sw.cpp
@@ -146,7 +146,7 @@ int PhysicsDirectSpaceStateSW::intersect_shape(const RID &p_shape, const Transfo
if (!_match_object_type_query(space->intersection_query_results[i], p_layer_mask, p_object_type_mask))
continue;
- //area cant be picked by ray (default)
+ //area can't be picked by ray (default)
if (p_exclude.has(space->intersection_query_results[i]->get_self()))
continue;
@@ -225,7 +225,7 @@ bool PhysicsDirectSpaceStateSW::cast_motion(const RID &p_shape, const Transform
//test initial overlap
#if 0
if (CollisionSolverSW::solve_static(shape,p_xform,col_obj->get_shape(shape_idx),col_obj_xform,NULL,NULL,&sep_axis)) {
- print_line("failed initial cast (collision at begining)");
+ print_line("failed initial cast (collision at beginning)");
return false;
}
#else