BlackMATov/unity-iso-tools
1
0
Fork 0
mirror of https://github.com/BlackMATov/unity-iso-tools.git synced 2025-12-16 14:09:00 +07:00
Code Issues Packages Projects Releases Wiki Activity

snapping fix

Browse Source
This commit is contained in:
Matvey Cherevko
2016-12-20 03:34:17 +07:00
parent cc08f1e2c7
commit a0ec6a93eb
1 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
Assets/IsoTools/Scripts/Internal/Editor/IsoEditorUtils.cs
View File

@@ -82,16 +82,16 @@ namespace IsoTools.Internal {
iso_objects.ToArray(), iso_objects.ToArray(),
iso_objects.Count > 1 ? "Move IsoObjects" : "Move IsoObject"); iso_objects.Count > 1 ? "Move IsoObjects" : "Move IsoObject");
} }
List<IsoObject> other_objects; var snapping_z = false;
if ( all_other_objects.TryGetValue(iso_world, out other_objects) && other_objects.Count > 0 ) { if ( IsSnapByObjectsEnabled(iso_world) ) {
var snapping_z = false; List<IsoObject> other_objects;
if ( IsSnapByObjectsEnabled(iso_world) ) { if ( all_other_objects.TryGetValue(iso_world, out other_objects) && other_objects.Count > 0 ) {
foreach ( var iso_object in iso_objects ) { foreach ( var iso_object in iso_objects ) {
var iso_orig_z = iso_object.positionZ; var iso_orig_z = iso_object.positionZ;
var result_p_z = iso_orig_z + delta; var result_p_z = iso_orig_z + delta;
foreach ( var other in other_objects ) { foreach ( var other in other_objects ) {
if ( IsoEditorUtils.IsSnapOverlaps(iso_object.positionX, iso_object.sizeX, other.positionX, other.sizeX) && if ( IsoEditorUtils.IsSnapOverlaps(iso_object.positionX, iso_object.sizeX, other.positionX, other.sizeX) &&
IsoEditorUtils.IsSnapOverlaps(iso_object.positionY, iso_object.sizeY, other.positionY, other.sizeY) ) IsoEditorUtils.IsSnapOverlaps(iso_object.positionY, iso_object.sizeY, other.positionY, other.sizeY) )
{ {
var new_snapping_z = !snapping_z && IsoEditorUtils.IsSnapOverlaps(result_p_z, iso_object.sizeZ, other.positionZ, other.sizeZ) var new_snapping_z = !snapping_z && IsoEditorUtils.IsSnapOverlaps(result_p_z, iso_object.sizeZ, other.positionZ, other.sizeZ)
? IsoEditorUtils.SnapProcess(ref result_p_z, iso_object.sizeZ, other.positionZ, other.sizeZ) ? IsoEditorUtils.SnapProcess(ref result_p_z, iso_object.sizeZ, other.positionZ, other.sizeZ)
@@ -108,16 +108,16 @@ namespace IsoTools.Internal {
} }
} }
} }
if ( IsSnapByCellsEnabled(iso_world) && !snapping_z ) { }
foreach ( var iso_object in iso_objects ) { if ( IsSnapByCellsEnabled(iso_world) && !snapping_z ) {
var iso_orig_z = iso_object.positionZ; foreach ( var iso_object in iso_objects ) {
var result_p_z = iso_orig_z + delta; var iso_orig_z = iso_object.positionZ;
var new_snapping_z = IsoEditorUtils.SnapProcess(ref result_p_z, iso_object.sizeZ, iso_object.tilePositionZ, 1.0f); var result_p_z = iso_orig_z + delta;
if ( new_snapping_z ) { var new_snapping_z = IsoEditorUtils.SnapProcess(ref result_p_z, iso_object.sizeZ, iso_object.tilePositionZ, 1.0f);
delta = result_p_z - iso_orig_z; if ( new_snapping_z ) {
snapping_z = true; delta = result_p_z - iso_orig_z;
break; snapping_z = true;
} break;
} }
} }
} }
@@ -148,11 +148,11 @@ namespace IsoTools.Internal {
iso_objects.ToArray(), iso_objects.ToArray(),
iso_objects.Count > 1 ? "Move IsoObjects" : "Move IsoObject"); iso_objects.Count > 1 ? "Move IsoObjects" : "Move IsoObject");
} }
List<IsoObject> other_objects; var snapping_x = false;
if ( all_other_objects.TryGetValue(iso_world, out other_objects) && other_objects.Count > 0 ) { var snapping_y = false;
var snapping_x = false; if ( IsSnapByObjectsEnabled(iso_world) ) {
var snapping_y = false; List<IsoObject> other_objects;
if ( IsSnapByObjectsEnabled(iso_world) ) { if ( all_other_objects.TryGetValue(iso_world, out other_objects) && other_objects.Count > 0 ) {
foreach ( var iso_object in iso_objects ) { foreach ( var iso_object in iso_objects ) {
var iso_orig_p = iso_object.position; var iso_orig_p = iso_object.position;
var result_pos_iso = iso_orig_p + iso_delta; var result_pos_iso = iso_orig_p + iso_delta;
@@ -186,26 +186,26 @@ namespace IsoTools.Internal {
} }
} }
} }
if ( IsSnapByCellsEnabled(iso_world) && !snapping_x && !snapping_y ) { }
foreach ( var iso_object in iso_objects ) { if ( IsSnapByCellsEnabled(iso_world) && !snapping_x && !snapping_y ) {
var iso_orig_p = iso_object.position; foreach ( var iso_object in iso_objects ) {
var result_pos_iso = iso_orig_p + iso_delta; var iso_orig_p = iso_object.position;
var new_snapping_x = IsoEditorUtils.SnapProcess(ref result_pos_iso.x, iso_object.sizeX, iso_object.tilePositionX, 1.0f); var result_pos_iso = iso_orig_p + iso_delta;
var new_snapping_y = IsoEditorUtils.SnapProcess(ref result_pos_iso.y, iso_object.sizeY, iso_object.tilePositionY, 1.0f); var new_snapping_x = IsoEditorUtils.SnapProcess(ref result_pos_iso.x, iso_object.sizeX, iso_object.tilePositionX, 1.0f);
if ( new_snapping_x || new_snapping_y ) { var new_snapping_y = IsoEditorUtils.SnapProcess(ref result_pos_iso.y, iso_object.sizeY, iso_object.tilePositionY, 1.0f);
if ( new_snapping_x ) { if ( new_snapping_x || new_snapping_y ) {
iso_delta.x = result_pos_iso.x - iso_orig_p.x; if ( new_snapping_x ) {
iso_delta.y = result_pos_iso.y - iso_orig_p.y; iso_delta.x = result_pos_iso.x - iso_orig_p.x;
snapping_x = true; iso_delta.y = result_pos_iso.y - iso_orig_p.y;
} snapping_x = true;
if ( new_snapping_y ) { }
iso_delta.x = result_pos_iso.x - iso_orig_p.x; if ( new_snapping_y ) {
iso_delta.y = result_pos_iso.y - iso_orig_p.y; iso_delta.x = result_pos_iso.x - iso_orig_p.x;
snapping_y = true; iso_delta.y = result_pos_iso.y - iso_orig_p.y;
} snapping_y = true;
if ( snapping_x && snapping_y ) { }
break; if ( snapping_x && snapping_y ) {
} break;
} }
} }
} }