From badbb0a53ceb27c72b0f500648ce4d717121b1b7 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Sun, 1 Jan 2017 02:45:59 +0700 Subject: [PATCH] fix false warnings --- Assets/IsoTools/Scripts/Internal/IsoUtils.cs | 13 +++++++++++++ .../IsoTools/Scripts/Internal/IsoWarningSolver.cs | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Assets/IsoTools/Scripts/Internal/IsoUtils.cs b/Assets/IsoTools/Scripts/Internal/IsoUtils.cs index aa79e31..6742723 100644 --- a/Assets/IsoTools/Scripts/Internal/IsoUtils.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoUtils.cs @@ -405,10 +405,23 @@ namespace IsoTools.Internal { return a == b; } + public static bool Vec2Approximately(Vector2 a, Vector2 b, float precision) { + return + Mathf.Abs(a.x - b.x) < precision && + Mathf.Abs(a.y - b.y) < precision; + } + public static bool Vec3Approximately(Vector3 a, Vector3 b) { return a == b; } + public static bool Vec3Approximately(Vector3 a, Vector3 b, float precision) { + return + Mathf.Abs(a.x - b.x) < precision && + Mathf.Abs(a.y - b.y) < precision && + Mathf.Abs(a.z - b.z) < precision; + } + // --------------------------------------------------------------------- // // Beautifiers diff --git a/Assets/IsoTools/Scripts/Internal/IsoWarningSolver.cs b/Assets/IsoTools/Scripts/Internal/IsoWarningSolver.cs index 98158e6..dce2314 100644 --- a/Assets/IsoTools/Scripts/Internal/IsoWarningSolver.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoWarningSolver.cs @@ -116,9 +116,10 @@ namespace IsoTools.Internal { void CheckChangedTransform(IsoObject iso_object) { var iso_world = iso_object.isoWorld; if ( iso_world ) { + var precision = Mathf.Min(iso_world.tileSize, iso_world.tileHeight) * 0.01f; var needed_position = iso_world.IsoToScreen(iso_object.position); var current_position = iso_object.transform.position; - if ( !IsoUtils.Vec2Approximately(needed_position, current_position) ) { + if ( !IsoUtils.Vec2Approximately(needed_position, current_position, precision) ) { Debug.LogWarning( "Don't change 'IsoObject.transform.position' manually!\n" + "Use 'IsoObject.position' instead.",