From 71b609a6c888861f66d6244f7682a7c8fef4ff50 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Sat, 26 Nov 2016 16:37:59 +0700 Subject: [PATCH] style fixes --- .../Internal/Editor/IsoObjectEditor.cs | 2 +- .../Scripts/Internal/IsoFakeCollider.cs | 2 +- .../Scripts/Internal/IsoFakeObject.cs | 2 +- .../Scripts/Internal/IsoFakeRigidbody.cs | 2 +- .../Scripts/Internal/IsoPhysicHelper.cs | 3 +- Assets/IsoTools/Scripts/Internal/IsoUtils.cs | 8 ++-- Assets/IsoTools/Scripts/IsoBoxCollider.cs | 2 +- Assets/IsoTools/Scripts/IsoCapsuleCollider.cs | 2 +- Assets/IsoTools/Scripts/IsoCollider.cs | 2 +- Assets/IsoTools/Scripts/IsoCollision.cs | 2 +- Assets/IsoTools/Scripts/IsoContactPoint.cs | 4 +- Assets/IsoTools/Scripts/IsoObject.cs | 26 ++++++------- Assets/IsoTools/Scripts/IsoRaycastHit.cs | 2 +- Assets/IsoTools/Scripts/IsoRigidbody.cs | 2 +- Assets/IsoTools/Scripts/IsoSphereCollider.cs | 2 +- Assets/IsoTools/Scripts/IsoWorld.cs | 38 +++++++++---------- 16 files changed, 51 insertions(+), 50 deletions(-) diff --git a/Assets/IsoTools/Scripts/Internal/Editor/IsoObjectEditor.cs b/Assets/IsoTools/Scripts/Internal/Editor/IsoObjectEditor.cs index 244c1b8..7f3685e 100644 --- a/Assets/IsoTools/Scripts/Internal/Editor/IsoObjectEditor.cs +++ b/Assets/IsoTools/Scripts/Internal/Editor/IsoObjectEditor.cs @@ -13,7 +13,7 @@ namespace IsoTools.Internal { Vector3 _center = Vector3.zero; Vector3 _viewCenter = Vector3.zero; - static public readonly float SnappingDistance = 0.2f; + public static readonly float SnappingDistance = 0.2f; static bool IsSnappingEnabled() { return !Event.current.control; diff --git a/Assets/IsoTools/Scripts/Internal/IsoFakeCollider.cs b/Assets/IsoTools/Scripts/Internal/IsoFakeCollider.cs index 491be59..e55e053 100644 --- a/Assets/IsoTools/Scripts/Internal/IsoFakeCollider.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoFakeCollider.cs @@ -13,4 +13,4 @@ namespace IsoTools.Internal { get { return _isoCollider; } } } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/Internal/IsoFakeObject.cs b/Assets/IsoTools/Scripts/Internal/IsoFakeObject.cs index 1738cc5..6d15f01 100644 --- a/Assets/IsoTools/Scripts/Internal/IsoFakeObject.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoFakeObject.cs @@ -32,4 +32,4 @@ namespace IsoTools.Internal { } } } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/Internal/IsoFakeRigidbody.cs b/Assets/IsoTools/Scripts/Internal/IsoFakeRigidbody.cs index 4f676d4..50635c7 100644 --- a/Assets/IsoTools/Scripts/Internal/IsoFakeRigidbody.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoFakeRigidbody.cs @@ -13,4 +13,4 @@ namespace IsoTools.Internal { get { return _isoRigidbody; } } } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/Internal/IsoPhysicHelper.cs b/Assets/IsoTools/Scripts/Internal/IsoPhysicHelper.cs index 5f4e805..564fa11 100644 --- a/Assets/IsoTools/Scripts/Internal/IsoPhysicHelper.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoPhysicHelper.cs @@ -1,5 +1,4 @@ using UnityEngine; -using System.Collections.Generic; namespace IsoTools.Internal { [DisallowMultipleComponent] @@ -29,4 +28,4 @@ namespace IsoTools.Internal { } } } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/Internal/IsoUtils.cs b/Assets/IsoTools/Scripts/Internal/IsoUtils.cs index 24c14c0..619542a 100644 --- a/Assets/IsoTools/Scripts/Internal/IsoUtils.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoUtils.cs @@ -22,7 +22,7 @@ namespace IsoTools.Internal { public static readonly Vector3 vec3OneYZ = new Vector3(0.0f, 1.0f, 1.0f); public static readonly Vector3 vec3OneXZ = new Vector3(1.0f, 0.0f, 1.0f); - static public readonly int FloatBeautifierDigits = 4; + public static readonly int FloatBeautifierDigits = 4; // --------------------------------------------------------------------- // @@ -55,7 +55,7 @@ namespace IsoTools.Internal { yMax > other.yMin && yMin < other.yMax; } - static public Rect zero { + public static Rect zero { get { return new Rect(); } } } @@ -89,7 +89,7 @@ namespace IsoTools.Internal { Mathf.Approximately(max, minmax.max); } - static public MinMax zero { + public static MinMax zero { get { return new MinMax(); } } } @@ -613,4 +613,4 @@ namespace IsoTools.Internal { } #endif } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoBoxCollider.cs b/Assets/IsoTools/Scripts/IsoBoxCollider.cs index 73a44ae..4d50aa3 100644 --- a/Assets/IsoTools/Scripts/IsoBoxCollider.cs +++ b/Assets/IsoTools/Scripts/IsoBoxCollider.cs @@ -74,4 +74,4 @@ namespace IsoTools { } #endif } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoCapsuleCollider.cs b/Assets/IsoTools/Scripts/IsoCapsuleCollider.cs index 3dab8a4..f70ed97 100644 --- a/Assets/IsoTools/Scripts/IsoCapsuleCollider.cs +++ b/Assets/IsoTools/Scripts/IsoCapsuleCollider.cs @@ -108,4 +108,4 @@ namespace IsoTools { } #endif } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoCollider.cs b/Assets/IsoTools/Scripts/IsoCollider.cs index 04c7554..e5ea36e 100644 --- a/Assets/IsoTools/Scripts/IsoCollider.cs +++ b/Assets/IsoTools/Scripts/IsoCollider.cs @@ -126,4 +126,4 @@ namespace IsoTools { } #endif } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoCollision.cs b/Assets/IsoTools/Scripts/IsoCollision.cs index 2f8824f..4ba4bff 100644 --- a/Assets/IsoTools/Scripts/IsoCollision.cs +++ b/Assets/IsoTools/Scripts/IsoCollision.cs @@ -20,4 +20,4 @@ namespace IsoTools { rigidbody = IsoUtils.IsoConvertRigidbody(collision.rigidbody); } } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoContactPoint.cs b/Assets/IsoTools/Scripts/IsoContactPoint.cs index 62a0c46..2c7e545 100644 --- a/Assets/IsoTools/Scripts/IsoContactPoint.cs +++ b/Assets/IsoTools/Scripts/IsoContactPoint.cs @@ -7,13 +7,15 @@ namespace IsoTools { public Vector3 normal { get; private set; } public IsoCollider otherCollider { get; private set; } public Vector3 point { get; private set; } + public float separation { get; private set; } public IsoCollider thisCollider { get; private set; } public IsoContactPoint(ContactPoint contact_point) : this() { normal = contact_point.normal; otherCollider = IsoUtils.IsoConvertCollider(contact_point.otherCollider); point = contact_point.point; + separation = contact_point.separation; thisCollider = IsoUtils.IsoConvertCollider(contact_point.thisCollider); } } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoObject.cs b/Assets/IsoTools/Scripts/IsoObject.cs index b3b130f..e668bf1 100644 --- a/Assets/IsoTools/Scripts/IsoObject.cs +++ b/Assets/IsoTools/Scripts/IsoObject.cs @@ -192,18 +192,18 @@ namespace IsoTools { // --------------------------------------------------------------------- public class InternalState { - public bool Dirty = false; - public bool Placed = false; - public IsoUtils.Rect ScreenRect = IsoUtils.Rect.zero; - public IsoUtils.MinMax MinMax3d = IsoUtils.MinMax.zero; - public float Offset3d = 0.0f; - public Vector2 MinSector = Vector2.zero; - public Vector2 MaxSector = Vector2.zero; - public Transform Transform = null; - public Vector2 LastTrans = Vector2.zero; - public List Renderers = new List(); - public IsoAssocList SelfDepends = new IsoAssocList(47); - public IsoAssocList TheirDepends = new IsoAssocList(47); + public bool Dirty = false; + public bool Placed = false; + public IsoUtils.Rect ScreenRect = IsoUtils.Rect.zero; + public IsoUtils.MinMax MinMax3d = IsoUtils.MinMax.zero; + public float Offset3d = 0.0f; + public Vector2 MinSector = Vector2.zero; + public Vector2 MaxSector = Vector2.zero; + public Transform Transform = null; + public Vector2 LastTrans = Vector2.zero; + public List Renderers = new List(); + public IsoAssocList SelfDepends = new IsoAssocList(47); + public IsoAssocList TheirDepends = new IsoAssocList(47); } public InternalState Internal = new InternalState(); @@ -345,4 +345,4 @@ namespace IsoTools { } #endif } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoRaycastHit.cs b/Assets/IsoTools/Scripts/IsoRaycastHit.cs index 720b783..5999a38 100644 --- a/Assets/IsoTools/Scripts/IsoRaycastHit.cs +++ b/Assets/IsoTools/Scripts/IsoRaycastHit.cs @@ -18,4 +18,4 @@ namespace IsoTools { rigidbody = IsoUtils.IsoConvertRigidbody(hit_info.rigidbody); } } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoRigidbody.cs b/Assets/IsoTools/Scripts/IsoRigidbody.cs index 9d57ef5..b0ac90d 100644 --- a/Assets/IsoTools/Scripts/IsoRigidbody.cs +++ b/Assets/IsoTools/Scripts/IsoRigidbody.cs @@ -397,4 +397,4 @@ namespace IsoTools { } #endif } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoSphereCollider.cs b/Assets/IsoTools/Scripts/IsoSphereCollider.cs index 546aa6a..dd20b46 100644 --- a/Assets/IsoTools/Scripts/IsoSphereCollider.cs +++ b/Assets/IsoTools/Scripts/IsoSphereCollider.cs @@ -74,4 +74,4 @@ namespace IsoTools { } #endif } -} +} \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoWorld.cs b/Assets/IsoTools/Scripts/IsoWorld.cs index f595366..9162810 100644 --- a/Assets/IsoTools/Scripts/IsoWorld.cs +++ b/Assets/IsoTools/Scripts/IsoWorld.cs @@ -42,29 +42,29 @@ namespace IsoTools { // // --------------------------------------------------------------------- - static public readonly float DefTileSize = 32.0f; - static public readonly float MinTileSize = Mathf.Epsilon; - static public readonly float MaxTileSize = float.MaxValue; + public static readonly float DefTileSize = 32.0f; + public static readonly float MinTileSize = Mathf.Epsilon; + public static readonly float MaxTileSize = float.MaxValue; - static public readonly float DefTileRatio = 0.5f; - static public readonly float MinTileRatio = 0.25f; - static public readonly float MaxTileRatio = 1.0f; + public static readonly float DefTileRatio = 0.5f; + public static readonly float MinTileRatio = 0.25f; + public static readonly float MaxTileRatio = 1.0f; - static public readonly float DefTileAngle = 45.0f; - static public readonly float MinTileAngle = 0.0f; - static public readonly float MaxTileAngle = 90.0f; + public static readonly float DefTileAngle = 45.0f; + public static readonly float MinTileAngle = 0.0f; + public static readonly float MaxTileAngle = 90.0f; - static public readonly float DefTileHeight = DefTileSize; - static public readonly float MinTileHeight = MinTileSize; - static public readonly float MaxTileHeight = MaxTileSize; + public static readonly float DefTileHeight = DefTileSize; + public static readonly float MinTileHeight = MinTileSize; + public static readonly float MaxTileHeight = MaxTileSize; - static public readonly float DefStepDepth = 0.1f; - static public readonly float MinStepDepth = Mathf.Epsilon; - static public readonly float MaxStepDepth = float.MaxValue; + public static readonly float DefStepDepth = 0.1f; + public static readonly float MinStepDepth = Mathf.Epsilon; + public static readonly float MaxStepDepth = float.MaxValue; - static public readonly float DefStartDepth = 1.0f; - static public readonly float MinStartDepth = float.MinValue; - static public readonly float MaxStartDepth = float.MaxValue; + public static readonly float DefStartDepth = 1.0f; + public static readonly float MinStartDepth = float.MinValue; + public static readonly float MaxStartDepth = float.MaxValue; // --------------------------------------------------------------------- // @@ -910,4 +910,4 @@ namespace IsoTools { } #endif } -} +} \ No newline at end of file