From 6574c1c8101673bea521f640ad0d4187b2f01f50 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Sun, 20 Dec 2015 18:01:43 +0600 Subject: [PATCH] Internal folder for utils --- Assembly-CSharp.csproj | 10 +++++----- Assets/IsoTools/Editor/IsoObjectEditor.cs | 2 +- .../Examples/Scripts/PlayerController.cs | 16 ++++++++++++---- Assets/IsoTools/Scripts/Internal.meta | 9 +++++++++ .../Scripts/{ => Internal}/IsoFakeCollider.cs | 4 ++-- .../{ => Internal}/IsoFakeCollider.cs.meta | 0 .../Scripts/{ => Internal}/IsoFakeObject.cs | 4 ++-- .../Scripts/{ => Internal}/IsoFakeObject.cs.meta | 0 .../Scripts/{ => Internal}/IsoFakeRigidbody.cs | 4 ++-- .../{ => Internal}/IsoFakeRigidbody.cs.meta | 0 .../Scripts/{ => Internal}/IsoPhysicHelper.cs | 4 ++-- .../{ => Internal}/IsoPhysicHelper.cs.meta | 0 .../IsoTools/Scripts/{ => Internal}/IsoUtils.cs | 4 ++-- .../Scripts/{ => Internal}/IsoUtils.cs.meta | 0 Assets/IsoTools/Scripts/IsoBoxCollider.cs | 1 + Assets/IsoTools/Scripts/IsoCollider.cs | 1 + Assets/IsoTools/Scripts/IsoCollision.cs | 1 + Assets/IsoTools/Scripts/IsoContactPoint.cs | 1 + Assets/IsoTools/Scripts/IsoObject.cs | 1 + Assets/IsoTools/Scripts/IsoRaycastHit.cs | 1 + Assets/IsoTools/Scripts/IsoRigidbody.cs | 1 + Assets/IsoTools/Scripts/IsoSphereCollider.cs | 1 + Assets/IsoTools/Scripts/IsoWorld.cs | 1 + 23 files changed, 46 insertions(+), 20 deletions(-) create mode 100644 Assets/IsoTools/Scripts/Internal.meta rename Assets/IsoTools/Scripts/{ => Internal}/IsoFakeCollider.cs (81%) rename Assets/IsoTools/Scripts/{ => Internal}/IsoFakeCollider.cs.meta (100%) rename Assets/IsoTools/Scripts/{ => Internal}/IsoFakeObject.cs (95%) rename Assets/IsoTools/Scripts/{ => Internal}/IsoFakeObject.cs.meta (100%) rename Assets/IsoTools/Scripts/{ => Internal}/IsoFakeRigidbody.cs (81%) rename Assets/IsoTools/Scripts/{ => Internal}/IsoFakeRigidbody.cs.meta (100%) rename Assets/IsoTools/Scripts/{ => Internal}/IsoPhysicHelper.cs (92%) rename Assets/IsoTools/Scripts/{ => Internal}/IsoPhysicHelper.cs.meta (100%) rename Assets/IsoTools/Scripts/{ => Internal}/IsoUtils.cs (99%) rename Assets/IsoTools/Scripts/{ => Internal}/IsoUtils.cs.meta (100%) diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index e58182b..22a4008 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -72,19 +72,19 @@ + + + + + - - - - - diff --git a/Assets/IsoTools/Editor/IsoObjectEditor.cs b/Assets/IsoTools/Editor/IsoObjectEditor.cs index cc7ee97..a5f6665 100644 --- a/Assets/IsoTools/Editor/IsoObjectEditor.cs +++ b/Assets/IsoTools/Editor/IsoObjectEditor.cs @@ -3,7 +3,7 @@ using UnityEditor; using System.Linq; using System.Collections.Generic; -namespace IsoTools { +namespace IsoTools.Internal { [CustomEditor(typeof(IsoObject)), CanEditMultipleObjects] class IsoObjectEditor : Editor { diff --git a/Assets/IsoTools/Examples/Scripts/PlayerController.cs b/Assets/IsoTools/Examples/Scripts/PlayerController.cs index 2be6ed8..60e0c62 100644 --- a/Assets/IsoTools/Examples/Scripts/PlayerController.cs +++ b/Assets/IsoTools/Examples/Scripts/PlayerController.cs @@ -26,16 +26,24 @@ namespace IsoTools.Examples { void Update () { if ( Input.GetKey(KeyCode.LeftArrow) ) { - _isoRigidbody.velocity = IsoUtils.Vec3ChangeX(_isoRigidbody.velocity, -speed); + var velocity = _isoRigidbody.velocity; + velocity.x = -speed; + _isoRigidbody.velocity = velocity; } else if ( Input.GetKey(KeyCode.RightArrow) ) { - _isoRigidbody.velocity = IsoUtils.Vec3ChangeX(_isoRigidbody.velocity, speed); + var velocity = _isoRigidbody.velocity; + velocity.x = speed; + _isoRigidbody.velocity = velocity; } else if ( Input.GetKey(KeyCode.DownArrow) ) { - _isoRigidbody.velocity = IsoUtils.Vec3ChangeY(_isoRigidbody.velocity, -speed); + var velocity = _isoRigidbody.velocity; + velocity.y = -speed; + _isoRigidbody.velocity = velocity; } else if ( Input.GetKey(KeyCode.UpArrow) ) { - _isoRigidbody.velocity = IsoUtils.Vec3ChangeY(_isoRigidbody.velocity, speed); + var velocity = _isoRigidbody.velocity; + velocity.y = speed; + _isoRigidbody.velocity = velocity; } } } diff --git a/Assets/IsoTools/Scripts/Internal.meta b/Assets/IsoTools/Scripts/Internal.meta new file mode 100644 index 0000000..8569754 --- /dev/null +++ b/Assets/IsoTools/Scripts/Internal.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1928ff5b707504be792209a6a7a3d561 +folderAsset: yes +timeCreated: 1450611793 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IsoTools/Scripts/IsoFakeCollider.cs b/Assets/IsoTools/Scripts/Internal/IsoFakeCollider.cs similarity index 81% rename from Assets/IsoTools/Scripts/IsoFakeCollider.cs rename to Assets/IsoTools/Scripts/Internal/IsoFakeCollider.cs index efecd96..a555afc 100644 --- a/Assets/IsoTools/Scripts/IsoFakeCollider.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoFakeCollider.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace IsoTools { +namespace IsoTools.Internal { public class IsoFakeCollider : MonoBehaviour { IsoCollider _isoCollider = null; @@ -13,4 +13,4 @@ namespace IsoTools { get { return _isoCollider; } } } -} // namespace IsoTools \ No newline at end of file +} // namespace IsoTools.Internal \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoFakeCollider.cs.meta b/Assets/IsoTools/Scripts/Internal/IsoFakeCollider.cs.meta similarity index 100% rename from Assets/IsoTools/Scripts/IsoFakeCollider.cs.meta rename to Assets/IsoTools/Scripts/Internal/IsoFakeCollider.cs.meta diff --git a/Assets/IsoTools/Scripts/IsoFakeObject.cs b/Assets/IsoTools/Scripts/Internal/IsoFakeObject.cs similarity index 95% rename from Assets/IsoTools/Scripts/IsoFakeObject.cs rename to Assets/IsoTools/Scripts/Internal/IsoFakeObject.cs index 5e1cf41..0c771b4 100644 --- a/Assets/IsoTools/Scripts/IsoFakeObject.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoFakeObject.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace IsoTools { +namespace IsoTools.Internal { public class IsoFakeObject : MonoBehaviour { IsoObject _isoObject = null; @@ -52,4 +52,4 @@ namespace IsoTools { SendMessageOptions.DontRequireReceiver); } } -} // namespace IsoTools \ No newline at end of file +} // namespace IsoTools.Internal \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoFakeObject.cs.meta b/Assets/IsoTools/Scripts/Internal/IsoFakeObject.cs.meta similarity index 100% rename from Assets/IsoTools/Scripts/IsoFakeObject.cs.meta rename to Assets/IsoTools/Scripts/Internal/IsoFakeObject.cs.meta diff --git a/Assets/IsoTools/Scripts/IsoFakeRigidbody.cs b/Assets/IsoTools/Scripts/Internal/IsoFakeRigidbody.cs similarity index 81% rename from Assets/IsoTools/Scripts/IsoFakeRigidbody.cs rename to Assets/IsoTools/Scripts/Internal/IsoFakeRigidbody.cs index 83a0df1..915e08c 100644 --- a/Assets/IsoTools/Scripts/IsoFakeRigidbody.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoFakeRigidbody.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace IsoTools { +namespace IsoTools.Internal { public class IsoFakeRigidbody : MonoBehaviour { IsoRigidbody _isoRigidbody = null; @@ -13,4 +13,4 @@ namespace IsoTools { get { return _isoRigidbody; } } } -} // namespace IsoTools \ No newline at end of file +} // namespace IsoTools.Internal \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoFakeRigidbody.cs.meta b/Assets/IsoTools/Scripts/Internal/IsoFakeRigidbody.cs.meta similarity index 100% rename from Assets/IsoTools/Scripts/IsoFakeRigidbody.cs.meta rename to Assets/IsoTools/Scripts/Internal/IsoFakeRigidbody.cs.meta diff --git a/Assets/IsoTools/Scripts/IsoPhysicHelper.cs b/Assets/IsoTools/Scripts/Internal/IsoPhysicHelper.cs similarity index 92% rename from Assets/IsoTools/Scripts/IsoPhysicHelper.cs rename to Assets/IsoTools/Scripts/Internal/IsoPhysicHelper.cs index 7f5f279..bb886f5 100644 --- a/Assets/IsoTools/Scripts/IsoPhysicHelper.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoPhysicHelper.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace IsoTools { +namespace IsoTools.Internal { [DisallowMultipleComponent] [RequireComponent(typeof(IsoObject))] public class IsoPhysicHelper : MonoBehaviour { @@ -27,4 +27,4 @@ namespace IsoTools { } } } -} // namespace IsoTools \ No newline at end of file +} // namespace IsoTools.Internal \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoPhysicHelper.cs.meta b/Assets/IsoTools/Scripts/Internal/IsoPhysicHelper.cs.meta similarity index 100% rename from Assets/IsoTools/Scripts/IsoPhysicHelper.cs.meta rename to Assets/IsoTools/Scripts/Internal/IsoPhysicHelper.cs.meta diff --git a/Assets/IsoTools/Scripts/IsoUtils.cs b/Assets/IsoTools/Scripts/Internal/IsoUtils.cs similarity index 99% rename from Assets/IsoTools/Scripts/IsoUtils.cs rename to Assets/IsoTools/Scripts/Internal/IsoUtils.cs index 9a92f1b..8afe345 100644 --- a/Assets/IsoTools/Scripts/IsoUtils.cs +++ b/Assets/IsoTools/Scripts/Internal/IsoUtils.cs @@ -4,7 +4,7 @@ using UnityEditor; #endif -namespace IsoTools { +namespace IsoTools.Internal { public static class IsoUtils { // --------------------------------------------------------------------- @@ -534,4 +534,4 @@ namespace IsoTools { } #endif } -} \ No newline at end of file +} // namespace IsoTools.Internal \ No newline at end of file diff --git a/Assets/IsoTools/Scripts/IsoUtils.cs.meta b/Assets/IsoTools/Scripts/Internal/IsoUtils.cs.meta similarity index 100% rename from Assets/IsoTools/Scripts/IsoUtils.cs.meta rename to Assets/IsoTools/Scripts/Internal/IsoUtils.cs.meta diff --git a/Assets/IsoTools/Scripts/IsoBoxCollider.cs b/Assets/IsoTools/Scripts/IsoBoxCollider.cs index 2494276..2ec058d 100644 --- a/Assets/IsoTools/Scripts/IsoBoxCollider.cs +++ b/Assets/IsoTools/Scripts/IsoBoxCollider.cs @@ -1,4 +1,5 @@ using UnityEngine; +using IsoTools.Internal; #if UNITY_EDITOR using UnityEditor; diff --git a/Assets/IsoTools/Scripts/IsoCollider.cs b/Assets/IsoTools/Scripts/IsoCollider.cs index c449f03..d334515 100644 --- a/Assets/IsoTools/Scripts/IsoCollider.cs +++ b/Assets/IsoTools/Scripts/IsoCollider.cs @@ -1,4 +1,5 @@ using UnityEngine; +using IsoTools.Internal; #if UNITY_EDITOR using UnityEditor; diff --git a/Assets/IsoTools/Scripts/IsoCollision.cs b/Assets/IsoTools/Scripts/IsoCollision.cs index 34a5ded..0c95dda 100644 --- a/Assets/IsoTools/Scripts/IsoCollision.cs +++ b/Assets/IsoTools/Scripts/IsoCollision.cs @@ -1,4 +1,5 @@ using UnityEngine; +using IsoTools.Internal; namespace IsoTools { public class IsoCollision { diff --git a/Assets/IsoTools/Scripts/IsoContactPoint.cs b/Assets/IsoTools/Scripts/IsoContactPoint.cs index 0137edc..e896072 100644 --- a/Assets/IsoTools/Scripts/IsoContactPoint.cs +++ b/Assets/IsoTools/Scripts/IsoContactPoint.cs @@ -1,4 +1,5 @@ using UnityEngine; +using IsoTools.Internal; namespace IsoTools { public struct IsoContactPoint { diff --git a/Assets/IsoTools/Scripts/IsoObject.cs b/Assets/IsoTools/Scripts/IsoObject.cs index 5e0da9f..f5d1feb 100644 --- a/Assets/IsoTools/Scripts/IsoObject.cs +++ b/Assets/IsoTools/Scripts/IsoObject.cs @@ -1,4 +1,5 @@ using UnityEngine; +using IsoTools.Internal; using System.Collections.Generic; #if UNITY_EDITOR diff --git a/Assets/IsoTools/Scripts/IsoRaycastHit.cs b/Assets/IsoTools/Scripts/IsoRaycastHit.cs index 1e8704f..49a2e4d 100644 --- a/Assets/IsoTools/Scripts/IsoRaycastHit.cs +++ b/Assets/IsoTools/Scripts/IsoRaycastHit.cs @@ -1,4 +1,5 @@ using UnityEngine; +using IsoTools.Internal; namespace IsoTools { public struct IsoRaycastHit { diff --git a/Assets/IsoTools/Scripts/IsoRigidbody.cs b/Assets/IsoTools/Scripts/IsoRigidbody.cs index 079420a..5ce7e10 100644 --- a/Assets/IsoTools/Scripts/IsoRigidbody.cs +++ b/Assets/IsoTools/Scripts/IsoRigidbody.cs @@ -1,4 +1,5 @@ using UnityEngine; +using IsoTools.Internal; #if UNITY_EDITOR using UnityEditor; diff --git a/Assets/IsoTools/Scripts/IsoSphereCollider.cs b/Assets/IsoTools/Scripts/IsoSphereCollider.cs index efd68bd..bd5c771 100644 --- a/Assets/IsoTools/Scripts/IsoSphereCollider.cs +++ b/Assets/IsoTools/Scripts/IsoSphereCollider.cs @@ -1,4 +1,5 @@ using UnityEngine; +using IsoTools.Internal; #if UNITY_EDITOR using UnityEditor; diff --git a/Assets/IsoTools/Scripts/IsoWorld.cs b/Assets/IsoTools/Scripts/IsoWorld.cs index 5b495fc..9adfb3b 100644 --- a/Assets/IsoTools/Scripts/IsoWorld.cs +++ b/Assets/IsoTools/Scripts/IsoWorld.cs @@ -1,4 +1,5 @@ using UnityEngine; +using IsoTools.Internal; using System.Collections.Generic; #if UNITY_EDITOR