From ff4faec197e1f1bdab8716ff776f2c20bb2c49cd Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Mon, 25 Apr 2016 01:21:27 +0600
Subject: [PATCH] float beautifier for editor move

---
 .../Internal/Editor/IsoObjectEditor.cs        | 28 +++++++++++++------
 Assets/IsoTools/Scripts/IsoObject.cs          |  3 ++
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/Assets/IsoTools/Scripts/Internal/Editor/IsoObjectEditor.cs b/Assets/IsoTools/Scripts/Internal/Editor/IsoObjectEditor.cs
index 276f85a..065aff4 100644
--- a/Assets/IsoTools/Scripts/Internal/Editor/IsoObjectEditor.cs
+++ b/Assets/IsoTools/Scripts/Internal/Editor/IsoObjectEditor.cs
@@ -7,13 +7,14 @@ namespace IsoTools.Internal {
 	[CustomEditor(typeof(IsoObject)), CanEditMultipleObjects]
 	class IsoObjectEditor : Editor {
 
-		IDictionary<IsoObject, Vector3> _positions       = new Dictionary<IsoObject, Vector3>();
-		IDictionary<IsoObject, float>   _isoZPositions   = new Dictionary<IsoObject, float>();
-		IList<IsoObject>                _otherObjects    = new List<IsoObject>();
-		Vector3                         _center          = Vector3.zero;
-		Vector3                         _viewCenter      = Vector3.zero;
+		IDictionary<IsoObject, Vector3> _positions     = new Dictionary<IsoObject, Vector3>();
+		IDictionary<IsoObject, float>   _isoZPositions = new Dictionary<IsoObject, float>();
+		IList<IsoObject>                _otherObjects  = new List<IsoObject>();
+		Vector3                         _center        = Vector3.zero;
+		Vector3                         _viewCenter    = Vector3.zero;
 
-		static public readonly float    SnappingDistance = 0.2f;
+		static public readonly float SnappingDistance       = 0.2f;
+		static public readonly float FloatBeautifierEpsilon = 1e-5f;
 
 		static bool IsSnappingEnabled() {
 			return !Event.current.control;
@@ -57,6 +58,17 @@ namespace IsoTools.Internal {
 			}
 		}
 
+		float FloatBeautifier(float v) {
+			var rv = Mathf.Round(v);
+			return Mathf.Abs(rv - v) < FloatBeautifierEpsilon ? rv : v;
+		}
+
+		Vector2 Vector2Beautifier(Vector2 v) {
+			v.x = FloatBeautifier(v.x);
+			v.y = FloatBeautifier(v.y);
+			return v;
+		}
+
 		bool SnappingProcess(ref float min_a, float size_a, float min_b, float size_b) {
 			var max_a  = min_a + size_a;
 			var max_b  = min_b + size_b;
@@ -137,8 +149,7 @@ namespace IsoTools.Internal {
 				var iso_object = pair.Key;
 				var iso_orig_z = pair.Value;
 				var result_p_z = iso_orig_z + delta;
-				iso_object.positionZ = result_p_z;
-				iso_object.FixTransform();
+				iso_object.positionZ = FloatBeautifier(result_p_z);
 				var z_delta = iso_object.position.z - iso_orig_z;
 				return Mathf.Abs(z_delta) > Mathf.Abs(AccIn) ? z_delta : AccIn;
 			});
@@ -212,6 +223,7 @@ namespace IsoTools.Internal {
 				var result_pos = iso_orig_p + delta;
 				iso_object.transform.position = result_pos;
 				iso_object.FixIsoPosition();
+				iso_object.positionXY = Vector2Beautifier(iso_object.positionXY);
 				var pos_delta = iso_object.transform.position - iso_orig_p;
 				return pos_delta.magnitude > AccIn.magnitude ? pos_delta : AccIn;
 			});
diff --git a/Assets/IsoTools/Scripts/IsoObject.cs b/Assets/IsoTools/Scripts/IsoObject.cs
index 991a336..40e0be5 100644
--- a/Assets/IsoTools/Scripts/IsoObject.cs
+++ b/Assets/IsoTools/Scripts/IsoObject.cs
@@ -89,14 +89,17 @@ namespace IsoTools {
 
 		public Vector2 positionXY {
 			get { return new Vector2(positionX, positionY); }
+			set { position = IsoUtils.Vec3ChangeXY(position, value.x, value.y); }
 		}
 
 		public Vector2 positionYZ {
 			get { return new Vector2(positionY, positionZ); }
+			set { position = IsoUtils.Vec3ChangeYZ(position, value.x, value.y); }
 		}
 
 		public Vector2 positionXZ {
 			get { return new Vector2(positionX, positionZ); }
+			set { position = IsoUtils.Vec3ChangeXZ(position, value.x, value.y); }
 		}
 
 		// ---------------------------------------------------------------------