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 by tiles too

Browse Source
This commit is contained in:
Matvey Cherevko
2016-04-24 23:15:41 +06:00
parent 40349a896a
commit 811466a749
3 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/IsoTools/Examples/Prefabs/Kenney/AlienBall.prefab
View File

@@ -75,7 +75,6 @@ MonoBehaviour:
_position: {x: 0, y: 0, z: 0}
_mode: 0
_cacheRenderers: 1
_isAlignment: 0
_isShowBounds: 0
--- !u!114 &11439950
MonoBehaviour:

1
Assets/IsoTools/Examples/Prefabs/Kenney/Player.prefab
View File

@@ -89,7 +89,6 @@ MonoBehaviour:
_position: {x: 0.62638426, y: 3.0810504, z: 0.53}
_mode: 0
_cacheRenderers: 1
_isAlignment: 0
_isShowBounds: 0
--- !u!114 &11434786
MonoBehaviour:

47
Assets/IsoTools/Scripts/Internal/Editor/IsoObjectEditor.cs
View File

@@ -112,10 +112,8 @@ namespace IsoTools.Internal {
? SnappingProcess(ref result_p_z, iso_object.sizeZ, other.positionZ, other.sizeZ)
: false;
if ( new_snapping_z ) {
if ( new_snapping_z ) {
delta = result_p_z - iso_orig_z;
snapping_z = true;
}
delta = result_p_z - iso_orig_z;
snapping_z = true;
}
}
}
@@ -123,6 +121,21 @@ namespace IsoTools.Internal {
break;
}
}
if ( !snapping_z ) {
foreach ( var pair in _isoZPositions ) {
var iso_object = pair.Key;
var iso_orig_z = pair.Value;
var result_p_z = iso_orig_z + delta;
var new_snapping_z = SnappingProcess(ref result_p_z, iso_object.sizeZ, iso_object.tilePositionZ, 1.0f);
if ( new_snapping_z ) {
delta = result_p_z - iso_orig_z;
snapping_z = true;
}
if ( snapping_z ) {
break;
}
}
}
}
return _isoZPositions.Aggregate(0.0f, (AccIn, pair) => {
var iso_object = pair.Key;
@@ -174,6 +187,32 @@ namespace IsoTools.Internal {
break;
}
}
if ( !snapping_x && !snapping_y ) {
foreach ( var pair in _positions ) {
var iso_object = pair.Key;
var iso_orig_p = pair.Value;
var result_pos = iso_orig_p + delta;
var result_pos_iso = IsoWorld.Instance.ScreenToIso(result_pos, iso_object.positionZ);
var new_snapping_x = SnappingProcess(ref result_pos_iso.x, iso_object.sizeX, iso_object.tilePositionX, 1.0f);
var new_snapping_y = SnappingProcess(ref result_pos_iso.y, iso_object.sizeY, iso_object.tilePositionY, 1.0f);
if ( new_snapping_x || new_snapping_y ) {
result_pos = IsoWorld.Instance.IsoToScreen(result_pos_iso);
if ( new_snapping_x ) {
delta.x = result_pos.x - iso_orig_p.x;
delta.y = result_pos.y - iso_orig_p.y;
snapping_x = true;
}
if ( new_snapping_y ) {
delta.x = result_pos.x - iso_orig_p.x;
delta.y = result_pos.y - iso_orig_p.y;
snapping_y = true;
}
}
if ( snapping_x && snapping_y ) {
break;
}
}
}
}
return _positions.Aggregate(Vector3.zero, (AccIn, pair) => {
var iso_object = pair.Key;