diff options
| author | SaracenOne | 2017-09-18 22:44:04 +0100 |
|---|---|---|
| committer | SaracenOne | 2017-09-20 01:54:01 +0100 |
| commit | 2e22c07f4261625834bd0d16aa5e09005666ab14 (patch) | |
| tree | 108928c82ae2d08410fb57f541d38c64baeeda56 /editor/plugins/texture_region_editor_plugin.cpp | |
| parent | cd2ffdc6725aa6f7a9a4af6fd5abcc4cafae61b4 (diff) | |
| download | godot-2e22c07f4261625834bd0d16aa5e09005666ab14.tar.gz godot-2e22c07f4261625834bd0d16aa5e09005666ab14.tar.zst godot-2e22c07f4261625834bd0d16aa5e09005666ab14.zip | |
Diffstat (limited to 'editor/plugins/texture_region_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/texture_region_editor_plugin.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 38d1350b0..651ba0637 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -735,23 +735,10 @@ void TextureRegionEditor::_edit_region() { edit_draw->update(); } -inline float _snap_scalar(float p_offset, float p_step, float separation, float p_target) { - if (p_step != 0) { - float a = Math::stepify(p_target - p_offset, p_step + separation) + p_offset; - float b = a; - if (p_target >= 0) - b -= separation; - else - b += p_step; - return (Math::abs(p_target - a) < Math::abs(p_target - b)) ? a : b; - } - return p_target; -} - Vector2 TextureRegionEditor::snap_point(Vector2 p_target) const { if (snap_mode == SNAP_GRID) { - p_target.x = _snap_scalar(snap_offset.x, snap_step.x, snap_separation.x, p_target.x); - p_target.y = _snap_scalar(snap_offset.y, snap_step.y, snap_separation.y, p_target.y); + p_target.x = Math::snap_scalar_seperation(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); } return p_target; |
