godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33203 from aaronfranke/seperation-typo 

Fix "seperate" typos
This commit is contained in:
Rémi Verschelde 2019-10-31 15:17:19 +01:00 committed by GitHub
parent 55fd63d9de 8754e21f48
commit 23a381d882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/math/math_funcs.h
View File

@ -472,7 +472,7 @@ public:
return p_step != 0 ? Math::stepify(p_target - p_offset, p_step) + p_offset : p_target; return p_step != 0 ? Math::stepify(p_target - p_offset, p_step) + p_offset : p_target;
} }
static _ALWAYS_INLINE_ float snap_scalar_seperation(float p_offset, float p_step, float p_target, float p_separation) { static _ALWAYS_INLINE_ float snap_scalar_separation(float p_offset, float p_step, float p_target, float p_separation) {
if (p_step != 0) { if (p_step != 0) {
float a = Math::stepify(p_target - p_offset, p_step + p_separation) + p_offset; float a = Math::stepify(p_target - p_offset, p_step + p_separation) + p_offset;
float b = a; float b = a;

8
editor/array_property_edit.cpp
View File

@ -267,9 +267,9 @@ void ArrayPropertyEdit::edit(Object *p_obj, const StringName &p_prop, const Stri
default_type = p_deftype; default_type = p_deftype;
if (!p_hint_string.empty()) { if (!p_hint_string.empty()) {
int hint_subtype_seperator = p_hint_string.find(":"); int hint_subtype_separator = p_hint_string.find(":");
if (hint_subtype_seperator >= 0) { if (hint_subtype_separator >= 0) {
String subtype_string = p_hint_string.substr(0, hint_subtype_seperator); String subtype_string = p_hint_string.substr(0, hint_subtype_separator);
int slash_pos = subtype_string.find("/"); int slash_pos = subtype_string.find("/");
if (slash_pos >= 0) { if (slash_pos >= 0) {
@ -277,7 +277,7 @@ void ArrayPropertyEdit::edit(Object *p_obj, const StringName &p_prop, const Stri
subtype_string = subtype_string.substr(0, slash_pos); subtype_string = subtype_string.substr(0, slash_pos);
} }
subtype_hint_string = p_hint_string.substr(hint_subtype_seperator + 1, p_hint_string.size() - hint_subtype_seperator - 1); subtype_hint_string = p_hint_string.substr(hint_subtype_separator + 1, p_hint_string.size() - hint_subtype_separator - 1);
subtype = Variant::Type(subtype_string.to_int()); subtype = Variant::Type(subtype_string.to_int());
} }
} }

8
editor/editor_properties_array_dict.cpp
View File

@ -475,16 +475,16 @@ void EditorPropertyArray::setup(Variant::Type p_array_type, const String &p_hint
array_type = p_array_type; array_type = p_array_type;
if (array_type == Variant::ARRAY && !p_hint_string.empty()) { if (array_type == Variant::ARRAY && !p_hint_string.empty()) {
int hint_subtype_seperator = p_hint_string.find(":"); int hint_subtype_separator = p_hint_string.find(":");
if (hint_subtype_seperator >= 0) { if (hint_subtype_separator >= 0) {
String subtype_string = p_hint_string.substr(0, hint_subtype_seperator); String subtype_string = p_hint_string.substr(0, hint_subtype_separator);
int slash_pos = subtype_string.find("/"); int slash_pos = subtype_string.find("/");
if (slash_pos >= 0) { if (slash_pos >= 0) {
subtype_hint = PropertyHint(subtype_string.substr(slash_pos + 1, subtype_string.size() - slash_pos - 1).to_int()); subtype_hint = PropertyHint(subtype_string.substr(slash_pos + 1, subtype_string.size() - slash_pos - 1).to_int());
subtype_string = subtype_string.substr(0, slash_pos); subtype_string = subtype_string.substr(0, slash_pos);
} }
subtype_hint_string = p_hint_string.substr(hint_subtype_seperator + 1, p_hint_string.size() - hint_subtype_seperator - 1); subtype_hint_string = p_hint_string.substr(hint_subtype_separator + 1, p_hint_string.size() - hint_subtype_separator - 1);
subtype = Variant::Type(subtype_string.to_int()); subtype = Variant::Type(subtype_string.to_int());
} }
} }

4
editor/plugins/texture_region_editor_plugin.cpp
View File

@ -866,8 +866,8 @@ void TextureRegionEditor::_edit_region() {
Vector2 TextureRegionEditor::snap_point(Vector2 p_target) const { Vector2 TextureRegionEditor::snap_point(Vector2 p_target) const {
if (snap_mode == SNAP_GRID) { if (snap_mode == SNAP_GRID) {
p_target.x = Math::snap_scalar_seperation(snap_offset.x, snap_step.x, p_target.x, snap_separation.x); p_target.x = Math::snap_scalar_separation(snap_offset.x, snap_step.x, p_target.x, snap_separation.x);
p_target.y = Math::snap_scalar_seperation(snap_offset.y, snap_step.y, p_target.y, snap_separation.y); p_target.y = Math::snap_scalar_separation(snap_offset.y, snap_step.y, p_target.y, snap_separation.y);
} }
return p_target; return p_target;

4
editor/plugins/tile_set_editor_plugin.cpp
View File

@ -3038,8 +3038,8 @@ Vector2 TileSetEditor::snap_point(const Vector2 &point) {
} }
if (tools[TOOL_GRID_SNAP]->is_pressed()) { if (tools[TOOL_GRID_SNAP]->is_pressed()) {
p.x = Math::snap_scalar_seperation(snap_offset.x, snap_step.x, p.x, snap_separation.x); p.x = Math::snap_scalar_separation(snap_offset.x, snap_step.x, p.x, snap_separation.x);
p.y = Math::snap_scalar_seperation(snap_offset.y, snap_step.y, p.y, snap_separation.y); p.y = Math::snap_scalar_separation(snap_offset.y, snap_step.y, p.y, snap_separation.y);
} }
if (tools[SHAPE_KEEP_INSIDE_TILE]->is_pressed()) { if (tools[SHAPE_KEEP_INSIDE_TILE]->is_pressed()) {
if (p.x < region.position.x) if (p.x < region.position.x)