diff --git a/.hgignore b/.hgignore index 5f5fa05..4714a9a 100644 --- a/.hgignore +++ b/.hgignore @@ -1,2 +1,3 @@ +glob:obj/* glob:Temp/* glob:Library/* diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index 629dae5..b5f09fe 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -3,9 +3,8 @@ Debug AnyCPU - 10.0.20506 + 8.0.30703 2.0 - {BD090B74-59E6-B8B4-61B5-2814183903F0} Library Properties @@ -34,76 +33,78 @@ - - /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\Frameworks\Managed\UnityEngine.dll - /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\Frameworks\Managed\UnityEditor.dll + + + + + + + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\UnityExtensions\Unity\Advertisements\Editor\UnityEditor.Advertisements.dll + + + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\UnityExtensions\Unity\EditorTestsRunner\Editor\nunit.framework.dll + + + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\UnityExtensions\Unity\EditorTestsRunner\Editor\UnityEditor.EditorTestsRunner.dll + + + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\UnityExtensions\Unity\GUISystem\UnityEngine.UI.dll + + + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\UnityExtensions\Unity\GUISystem\Editor\UnityEditor.UI.dll + + + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\UnityExtensions\Unity\Networking\UnityEngine.Networking.dll + + + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\UnityExtensions\Unity\Networking\Editor\UnityEditor.Networking.dll + + + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\UnityExtensions\Unity\TreeEditor\Editor\UnityEditor.TreeEditor.dll + + + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\Frameworks\Managed\UnityEditor.Graphs.dll + + + ..\..\..\..\..\Applications\Unity\PlaybackEngines\AndroidPlayer\UnityEditor.Android.Extensions.dll + + + ..\..\..\..\..\Applications\Unity\PlaybackEngines\iOSSupport\UnityEditor.iOS.Extensions.dll + + + ..\..\..\..\..\Applications\Unity\PlaybackEngines\TizenPlayer\UnityEditor.Tizen.Extensions.dll + + + ..\..\..\..\..\Applications\Unity\PlaybackEngines\STVPlayer\UnityEditor.SamsungTV.Extensions.dll + + + ..\..\..\..\..\Applications\Unity\PlaybackEngines\WebGLSupport\UnityEditor.WebGL.Extensions.dll + + + ..\..\..\..\..\Applications\Unity\PlaybackEngines\LinuxStandaloneSupport\UnityEditor.LinuxStandalone.Extensions.dll + + + ..\..\..\..\..\Applications\Unity\PlaybackEngines\WindowsStandaloneSupport\UnityEditor.WindowsStandalone.Extensions.dll + + + ..\..\..\..\..\Applications\Unity\PlaybackEngines\MacStandaloneSupport\UnityEditor.OSXStandalone.Extensions.dll + + + ..\..\..\..\..\Applications\Unity\PlaybackEngines\iOSSupport\UnityEditor.iOS.Extensions.Xcode.dll - - - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll - - - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/EditorTestsRunner/Editor/nunit.framework.dll - - - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/EditorTestsRunner/Editor/UnityEditor.EditorTestsRunner.dll - - - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll - - - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll - - - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll - - - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll - - - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TreeEditor/Editor/UnityEditor.TreeEditor.dll - - - /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.Graphs.dll - - - /Applications/Unity/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll - - - /Applications/Unity/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll - - - /Applications/Unity/PlaybackEngines/TizenPlayer/UnityEditor.Tizen.Extensions.dll - - - /Applications/Unity/PlaybackEngines/STVPlayer/UnityEditor.SamsungTV.Extensions.dll - - - /Applications/Unity/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll - - - /Applications/Unity/PlaybackEngines/LinuxStandaloneSupport/UnityEditor.LinuxStandalone.Extensions.dll - - - /Applications/Unity/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll - - - /Applications/Unity/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll - - - /Applications/Unity/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll - - - - {95166F85-0462-AC59-009C-63E7F7F767D5} Assembly-CSharp + {95166F85-0462-AC59-009C-63E7F7F767D5} + Assembly-CSharp + - diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 6311d28..46419ca 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -3,9 +3,8 @@ Debug AnyCPU - 10.0.20506 + 8.0.30703 2.0 - {95166F85-0462-AC59-009C-63E7F7F767D5} Library Properties @@ -34,46 +33,46 @@ - - /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\Frameworks\Managed\UnityEngine.dll - /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\Frameworks\Managed\UnityEditor.dll + - - - - - - - - - - - - - - - - - - - - - - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll - - - /Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll - - - /Applications/Unity/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll - + + + + + + + + + + + + + + + + + + + + + + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\UnityExtensions\Unity\GUISystem\UnityEngine.UI.dll + + + ..\..\..\..\..\Applications\Unity\Unity.app\Contents\UnityExtensions\Unity\Networking\UnityEngine.Networking.dll + + + ..\..\..\..\..\Applications\Unity\PlaybackEngines\iOSSupport\UnityEditor.iOS.Extensions.Xcode.dll + - diff --git a/Assets/IsoTools/Scripts/IsoCollider.cs b/Assets/IsoTools/Scripts/IsoCollider.cs index d71d7ed..c449f03 100644 --- a/Assets/IsoTools/Scripts/IsoCollider.cs +++ b/Assets/IsoTools/Scripts/IsoCollider.cs @@ -68,7 +68,7 @@ namespace IsoTools { } public bool Raycast(Ray ray, out IsoRaycastHit iso_hit_info, float max_distance) { - RaycastHit hit_info; + var hit_info = new RaycastHit(); var result = realCollider ? realCollider.Raycast(ray, out hit_info, max_distance) : false; diff --git a/Assets/IsoTools/Scripts/IsoContactPoint.cs b/Assets/IsoTools/Scripts/IsoContactPoint.cs index 831e71e..0137edc 100644 --- a/Assets/IsoTools/Scripts/IsoContactPoint.cs +++ b/Assets/IsoTools/Scripts/IsoContactPoint.cs @@ -8,7 +8,7 @@ namespace IsoTools { public Vector3 point { get; private set; } public IsoCollider thisCollider { get; private set; } - public IsoContactPoint(ContactPoint contact_point) { + public IsoContactPoint(ContactPoint contact_point) : this() { normal = contact_point.normal; otherCollider = IsoUtils.IsoConvertCollider(contact_point.otherCollider); point = contact_point.point; diff --git a/Assets/IsoTools/Scripts/IsoRaycastHit.cs b/Assets/IsoTools/Scripts/IsoRaycastHit.cs index bd3ded0..1e8704f 100644 --- a/Assets/IsoTools/Scripts/IsoRaycastHit.cs +++ b/Assets/IsoTools/Scripts/IsoRaycastHit.cs @@ -9,7 +9,7 @@ namespace IsoTools { public Vector3 point { get; private set; } public IsoRigidbody rigidbody { get; private set; } - public IsoRaycastHit(RaycastHit hit_info) { + public IsoRaycastHit(RaycastHit hit_info) : this() { collider = IsoUtils.IsoConvertCollider(hit_info.collider); distance = hit_info.distance; normal = hit_info.normal; diff --git a/Assets/IsoTools/Scripts/IsoRigidbody.cs b/Assets/IsoTools/Scripts/IsoRigidbody.cs index d5a980d..079420a 100644 --- a/Assets/IsoTools/Scripts/IsoRigidbody.cs +++ b/Assets/IsoTools/Scripts/IsoRigidbody.cs @@ -235,7 +235,7 @@ namespace IsoTools { } public bool SweepTest(Vector3 direction, out IsoRaycastHit iso_hit_info, float max_distance) { - RaycastHit hit_info; + var hit_info = new RaycastHit(); var result = realRigidbody ? realRigidbody.SweepTest(direction, out hit_info, max_distance) : false; diff --git a/UnityIso.sln b/UnityIso.sln index a0c563c..0f84fd2 100644 --- a/UnityIso.sln +++ b/UnityIso.sln @@ -1,9 +1,9 @@ + Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2008 - -Project("{9D0FFEC9-0383-4C40-DA01-96F3C6394847}") = "unityiso", "Assembly-CSharp.csproj", "{95166F85-0462-AC59-009C-63E7F7F767D5}" +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{95166F85-0462-AC59-009C-63E7F7F767D5}" EndProject -Project("{9D0FFEC9-0383-4C40-DA01-96F3C6394847}") = "unityiso", "Assembly-CSharp-Editor.csproj", "{BD090B74-59E6-B8B4-61B5-2814183903F0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{BD090B74-59E6-B8B4-61B5-2814183903F0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -20,25 +20,54 @@ Global {BD090B74-59E6-B8B4-61B5-2814183903F0}.Release|Any CPU.ActiveCfg = Release|Any CPU {BD090B74-59E6-B8B4-61B5-2814183903F0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = Assembly-CSharp.csproj + GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 $0.TextStylePolicy = $1 - $1.inheritsSet = null + $1.TabsToSpaces = False + $1.NoTabsAfterNonTabs = True + $1.EolMarker = Unix + $1.inheritsSet = VisualStudio + $1.inheritsScope = text/plain $1.scope = text/x-csharp $0.CSharpFormattingPolicy = $2 + $2.NamespaceBraceStyle = EndOfLine + $2.ClassBraceStyle = EndOfLine + $2.InterfaceBraceStyle = EndOfLine + $2.StructBraceStyle = EndOfLine + $2.EnumBraceStyle = EndOfLine + $2.MethodBraceStyle = EndOfLine + $2.ConstructorBraceStyle = EndOfLine + $2.DestructorBraceStyle = EndOfLine + $2.BeforeMethodDeclarationParentheses = False + $2.BeforeMethodCallParentheses = False + $2.BeforeConstructorDeclarationParentheses = False + $2.BeforeIndexerDeclarationBracket = False + $2.BeforeDelegateDeclarationParentheses = False + $2.NewParentheses = False + $2.WithinIfParentheses = True + $2.WithinWhileParentheses = True + $2.WithinForParentheses = True + $2.WithinForEachParentheses = True + $2.WithinCatchParentheses = True + $2.WithinSwitchParentheses = True + $2.WithinLockParentheses = True + $2.WithinUsingParentheses = True + $2.SpacesBeforeBrackets = False $2.inheritsSet = Mono $2.inheritsScope = text/x-csharp $2.scope = text/x-csharp $0.TextStylePolicy = $3 - $3.FileWidth = 120 - $3.TabWidth = 4 + $3.TabsToSpaces = False + $3.NoTabsAfterNonTabs = True $3.EolMarker = Unix - $3.inheritsSet = Mono + $3.inheritsSet = VisualStudio $3.inheritsScope = text/plain $3.scope = text/plain + $0.DotNetNamingPolicy = $4 + $4.DirectoryNamespaceAssociation = None + $4.ResourceNamePolicy = FileFormatDefault + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/UnityIso.userprefs b/UnityIso.userprefs index 985ace6..9210384 100644 --- a/UnityIso.userprefs +++ b/UnityIso.userprefs @@ -1,8 +1,10 @@ - - + + - + + +