summaryrefslogtreecommitdiff
path: root/servers
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
parentc103f32ea3b19c3588d54dcef98e307f8b823f4c (diff)
Fix typos in source code using codespell
From https://github.com/lucasdemarchi/codespell
Diffstat (limited to 'servers')
-rw-r--r--servers/audio/audio_filter_sw.cpp2
-rw-r--r--servers/audio/effects/audio_effect_chorus.cpp2
-rw-r--r--servers/audio/effects/reverb.cpp2
-rw-r--r--servers/audio_server.cpp2
-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
-rw-r--r--servers/physics_2d/body_2d_sw.cpp2
-rw-r--r--servers/physics_2d/physics_2d_server_sw.cpp2
-rw-r--r--servers/visual/rasterizer.cpp2
-rw-r--r--servers/visual/rasterizer.h2
-rw-r--r--servers/visual/shader_language.cpp6
-rw-r--r--servers/visual/visual_server_scene.cpp6
15 files changed, 20 insertions, 20 deletions
diff --git a/servers/audio/audio_filter_sw.cpp b/servers/audio/audio_filter_sw.cpp
index b3ed76f22c..4bfe31247b 100644
--- a/servers/audio/audio_filter_sw.cpp
+++ b/servers/audio/audio_filter_sw.cpp
@@ -57,7 +57,7 @@ void AudioFilterSW::prepare_coefficients(Coeffs *p_coeffs) {
double final_cutoff = (cutoff > sr_limit) ? sr_limit : cutoff;
if (final_cutoff < 1) //avoid crapness
- final_cutoff = 1; //dont allow less than this
+ final_cutoff = 1; //don't allow less than this
double omega = 2.0 * Math_PI * final_cutoff / sampling_rate;
diff --git a/servers/audio/effects/audio_effect_chorus.cpp b/servers/audio/effects/audio_effect_chorus.cpp
index fa3a571c6e..27b03351c8 100644
--- a/servers/audio/effects/audio_effect_chorus.cpp
+++ b/servers/audio/effects/audio_effect_chorus.cpp
@@ -76,7 +76,7 @@ void AudioEffectChorusInstance::_process_chunk(const AudioFrame *p_src_frames, A
uint64_t local_cycles = cycles[vc];
uint64_t increment = llrint(cycles_to_mix / (double)p_frame_count * (double)(1 << AudioEffectChorus::CYCLES_FRAC));
- //check the LFO doesnt read ahead of the write pos
+ //check the LFO doesn't read ahead of the write pos
if ((((int)max_depth_frames) + 10) > delay_frames) { //10 as some threshold to avoid precision stuff
delay_frames += (int)max_depth_frames - delay_frames;
delay_frames += 10; //threshold to avoid precision stuff
diff --git a/servers/audio/effects/reverb.cpp b/servers/audio/effects/reverb.cpp
index 6462977d7c..26e6f50667 100644
--- a/servers/audio/effects/reverb.cpp
+++ b/servers/audio/effects/reverb.cpp
@@ -235,7 +235,7 @@ void Reverb::set_extra_spread_base(float p_sec) {
void Reverb::configure_buffers() {
- clear_buffers(); //clear if necesary
+ clear_buffers(); //clear if necessary
for (int i = 0; i < MAX_COMBS; i++) {
diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
index 8f45d0966f..5f70f52576 100644
--- a/servers/audio_server.cpp
+++ b/servers/audio_server.cpp
@@ -255,7 +255,7 @@ void AudioServer::_mix_step() {
bus->channels[k].last_mix_with_audio = mix_frames;
} else if (mix_frames - bus->channels[k].last_mix_with_audio > channel_disable_frames) {
bus->channels[k].active = false;
- continue; //went inactive, dont mix.
+ continue; //went inactive, don't mix.
}
}
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
diff --git a/servers/physics_2d/body_2d_sw.cpp b/servers/physics_2d/body_2d_sw.cpp
index d49dd35ade..26f319559e 100644
--- a/servers/physics_2d/body_2d_sw.cpp
+++ b/servers/physics_2d/body_2d_sw.cpp
@@ -484,7 +484,7 @@ void Body2DSW::integrate_forces(real_t p_step) {
} else {
if (!omit_force_integration && !first_integration) {
- //overriden by direct state query
+ //overridden by direct state query
Vector2 force = gravity * mass;
force += applied_force;
diff --git a/servers/physics_2d/physics_2d_server_sw.cpp b/servers/physics_2d/physics_2d_server_sw.cpp
index 0a56683c5d..92555e26b6 100644
--- a/servers/physics_2d/physics_2d_server_sw.cpp
+++ b/servers/physics_2d/physics_2d_server_sw.cpp
@@ -266,7 +266,7 @@ Physics2DDirectSpaceState *Physics2DServerSW::space_get_direct_state(RID p_space
ERR_FAIL_COND_V(!space, NULL);
if ((using_threads && !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/visual/rasterizer.cpp b/servers/visual/rasterizer.cpp
index fdcc4f5633..1be65be927 100644
--- a/servers/visual/rasterizer.cpp
+++ b/servers/visual/rasterizer.cpp
@@ -610,7 +610,7 @@ void Rasterizer::_free_fixed_material(const RID& p_material) {
void Rasterizer::flush_frame() {
- //not really necesary to implement
+ //not really necessary to implement
}
Rasterizer::Rasterizer() {
diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h
index 527230895c..838ddead75 100644
--- a/servers/visual/rasterizer.h
+++ b/servers/visual/rasterizer.h
@@ -1489,7 +1489,7 @@ public:
virtual void end_shadow_map()=0;
virtual void end_frame()=0;
- virtual void flush_frame(); //not necesary in most cases
+ virtual void flush_frame(); //not necessary in most cases
/* CANVAS API */
diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp
index 3bc495f08e..bc4452d5a8 100644
--- a/servers/visual/shader_language.cpp
+++ b/servers/visual/shader_language.cpp
@@ -2820,7 +2820,7 @@ ShaderLanguage::Node *ShaderLanguage::_parse_expression(BlockNode *p_block, cons
// this is not invalid and can really appear
// but it becomes invalid anyway because no binary op
// can be followed by an unary op in a valid combination,
- // due to how precedence works, unaries will always dissapear first
+ // due to how precedence works, unaries will always disappear first
_set_error("Parser bug..");
}
@@ -3374,7 +3374,7 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, Map<StringName, DataTy
}
if (!is_token_datatype(tk.type)) {
- _set_error("Expected funtion, uniform or varying ");
+ _set_error("Expected function, uniform or varying ");
return ERR_PARSE_ERROR;
}
@@ -3492,7 +3492,7 @@ Error ShaderLanguage::_parse_shader(const Map<StringName, Map<StringName, DataTy
}
}
- //all good let's parse inside the fucntion!
+ //all good let's parse inside the function!
tk = _get_token();
if (tk.type != TK_CURLY_BRACKET_OPEN) {
_set_error("Expected '{' to begin function");
diff --git a/servers/visual/visual_server_scene.cpp b/servers/visual/visual_server_scene.cpp
index 46c7fa6791..9b77ca9e1c 100644
--- a/servers/visual/visual_server_scene.cpp
+++ b/servers/visual/visual_server_scene.cpp
@@ -2447,7 +2447,7 @@ void VisualServerScene::_setup_gi_probe(Instance *p_instance) {
for (int y = 0; y < 4; y++) {
for (int x = 0; x < 4; x++) {
- //substract minimum
+ //subtract minimum
uint32_t a = uint32_t(alpha_block[x][y]) - min_alpha;
//convert range to 3 bits
a = int((a * 7.0 / (max_alpha - min_alpha)) + 0.5);
@@ -2923,7 +2923,7 @@ void VisualServerScene::_bake_gi_probe(Instance *p_gi_probe) {
colors[j].z = (local_data[b.sources[j]].energy[2] / float(probe_data->dynamic.bake_dynamic_range)) / 1024.0;
}
//super quick and dirty compression
- //find 2 most futher apart
+ //find 2 most further apart
float distance = 0;
Vector3 from, to;
@@ -3001,7 +3001,7 @@ void VisualServerScene::_bake_gi_probe(Instance *p_gi_probe) {
}
}
- //by default, 1 is black, otherwise it will be overriden by source
+ //by default, 1 is black, otherwise it will be overridden by source
uint32_t index_block[16] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };