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

float beautifier for editor move

Browse Source
This commit is contained in:
Matvey Cherevko
2016-04-25 01:21:27 +06:00
parent bff9b5ca3a
commit ff4faec197
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,13 +7,14 @@ namespace IsoTools.Internal {
[CustomEditor(typeof(IsoObject)), CanEditMultipleObjects] [CustomEditor(typeof(IsoObject)), CanEditMultipleObjects]
class IsoObjectEditor : Editor { class IsoObjectEditor : Editor {
IDictionary<IsoObject, Vector3> _positions = new Dictionary<IsoObject, Vector3>(); IDictionary<IsoObject, Vector3> _positions = new Dictionary<IsoObject, Vector3>();
IDictionary<IsoObject, float> _isoZPositions = new Dictionary<IsoObject, float>(); IDictionary<IsoObject, float> _isoZPositions = new Dictionary<IsoObject, float>();
IList<IsoObject> _otherObjects = new List<IsoObject>(); IList<IsoObject> _otherObjects = new List<IsoObject>();
Vector3 _center = Vector3.zero; Vector3 _center = Vector3.zero;
Vector3 _viewCenter = 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() { static bool IsSnappingEnabled() {
return !Event.current.control; 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) { bool SnappingProcess(ref float min_a, float size_a, float min_b, float size_b) {
var max_a = min_a + size_a; var max_a = min_a + size_a;
var max_b = min_b + size_b; var max_b = min_b + size_b;
@@ -137,8 +149,7 @@ namespace IsoTools.Internal {
var iso_object = pair.Key; var iso_object = pair.Key;
var iso_orig_z = pair.Value; var iso_orig_z = pair.Value;
var result_p_z = iso_orig_z + delta; var result_p_z = iso_orig_z + delta;
iso_object.positionZ = result_p_z; iso_object.positionZ = FloatBeautifier(result_p_z);
iso_object.FixTransform();
var z_delta = iso_object.position.z - iso_orig_z; var z_delta = iso_object.position.z - iso_orig_z;
return Mathf.Abs(z_delta) > Mathf.Abs(AccIn) ? z_delta : AccIn; 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; var result_pos = iso_orig_p + delta;
iso_object.transform.position = result_pos; iso_object.transform.position = result_pos;
iso_object.FixIsoPosition(); iso_object.FixIsoPosition();
iso_object.positionXY = Vector2Beautifier(iso_object.positionXY);
var pos_delta = iso_object.transform.position - iso_orig_p; var pos_delta = iso_object.transform.position - iso_orig_p;
return pos_delta.magnitude > AccIn.magnitude ? pos_delta : AccIn; return pos_delta.magnitude > AccIn.magnitude ? pos_delta : AccIn;
}); });

3
Assets/IsoTools/Scripts/IsoObject.cs
View File

@@ -89,14 +89,17 @@ namespace IsoTools {
public Vector2 positionXY { public Vector2 positionXY {
get { return new Vector2(positionX, positionY); } get { return new Vector2(positionX, positionY); }
set { position = IsoUtils.Vec3ChangeXY(position, value.x, value.y); }
} }
public Vector2 positionYZ { public Vector2 positionYZ {
get { return new Vector2(positionY, positionZ); } get { return new Vector2(positionY, positionZ); }
set { position = IsoUtils.Vec3ChangeYZ(position, value.x, value.y); }
} }
public Vector2 positionXZ { public Vector2 positionXZ {
get { return new Vector2(positionX, positionZ); } get { return new Vector2(positionX, positionZ); }
set { position = IsoUtils.Vec3ChangeXZ(position, value.x, value.y); }
} }
// --------------------------------------------------------------------- // ---------------------------------------------------------------------