for C# style using

ikpil · Dec 27, 2023 · 884201b · 884201b
1 parent 47f8d51
commit 884201b
Show file tree

Hide file tree

Showing 23 changed files with 118 additions and 167 deletions.
diff --git a/Editor/UniRecast.Editor/UniRcConvexVolumeToolEditor.cs b/Editor/UniRecast.Editor/UniRcConvexVolumeToolEditor.cs
@@ -1,10 +1,10 @@
-namespace UniRecast.Editor
-{
-    using DotRecast.Recast.Toolset.Builder;
-    using UnityEditor;
-    using UniRecast.Core;
-    using UniRecast.Toolsets;
+using DotRecast.Recast.Toolset.Builder;
+using UnityEditor;
+using UniRecast.Core;
+using UniRecast.Toolsets;
 
+namespace UniRecast.Editor
+{
     [CanEditMultipleObjects]
     [CustomEditor(typeof(UniRcConvexVolumeTool))]
     public class UniRcConvexVolumeToolEditor : UniRcToolEditor
@@ -20,7 +20,7 @@ private void OnEnable()
             _boxHeight = serializedObject.FindPropertySafe(nameof(_boxHeight));
             _boxDescent = serializedObject.FindPropertySafe(nameof(_boxDescent));
             _polyOffset = serializedObject.FindPropertySafe(nameof(_polyOffset));
-            
+
             _areaTypeValue = serializedObject.FindPropertySafe(nameof(_areaTypeValue));
         }
 
@@ -64,7 +64,7 @@ protected override void Layout()
                 //     geom.ClearConvexVolumes();
                 // }
             }
-            
+
             serializedObject.ApplyModifiedProperties();
         }
     }

diff --git a/Editor/UniRecast.Editor/UniRcCrowdAgentProfilingToolEditor.cs b/Editor/UniRecast.Editor/UniRcCrowdAgentProfilingToolEditor.cs
@@ -1,8 +1,8 @@
-namespace UniRecast.Editor
-{
-    using UnityEditor;
-    using UniRecast.Toolsets;
+using UnityEditor;
+using UniRecast.Toolsets;
 
+namespace UniRecast.Editor
+{
     [CustomEditor(typeof(UniRcCrowdAgentProfilingTool))]
     public class UniRcCrowdAgentProfilingToolEditor : UniRcToolEditor
     {

diff --git a/Editor/UniRecast.Editor/UniRcCrowdToolEditor.cs b/Editor/UniRecast.Editor/UniRcCrowdToolEditor.cs
@@ -1,10 +1,10 @@
-namespace UniRecast.Editor
-{
-    using DotRecast.Recast.Toolset.Tools;
-    using UniRecast.Core;
-    using UniRecast.Toolsets;
-    using UnityEditor;
+using DotRecast.Recast.Toolset.Tools;
+using UnityEditor;
+using UniRecast.Core;
+using UniRecast.Toolsets;
 
+namespace UniRecast.Editor
+{
     [CanEditMultipleObjects]
     [CustomEditor(typeof(UniRcCrowdTool))]
     public class UniRcCrowdToolEditor : UniRcToolEditor

diff --git a/Editor/UniRecast.Editor/UniRcDynamicUpdateToolEditor.cs b/Editor/UniRecast.Editor/UniRcDynamicUpdateToolEditor.cs
@@ -1,8 +1,8 @@
-namespace UniRecast.Editor
-{
-    using UniRecast.Toolsets;
-    using UnityEditor;
+using UniRecast.Toolsets;
+using UnityEditor;
 
+namespace UniRecast.Editor
+{
     [CustomEditor(typeof(UniRcDynamicUpdateTool))]
     public class UniRcDynamicUpdateToolEditor : UniRcToolEditor
     {

diff --git a/Editor/UniRecast.Editor/UniRcGui.cs b/Editor/UniRecast.Editor/UniRcGui.cs
@@ -1,9 +1,10 @@
-namespace UniRecast.Editor
-{
-    using System;
-    using UnityEditor;
-    using UnityEngine;
+using System;
+using UnityEditor;
+using UnityEngine;
+
+namespace UniRecast.Editor
 
+{
     public static class UniRcGui
     {
         public static void DrawAgentDiagram(Rect rect, float agentRadius, float agentHeight, float agentClimb, float agentSlope)

diff --git a/Editor/UniRecast.Editor/UniRcGuiUtility.cs b/Editor/UniRecast.Editor/UniRcGuiUtility.cs
@@ -19,5 +19,16 @@ public static GameObject CreateAndSelectGameObject(string suggestedName, GameObj
 
             return child;
         }
+
+        public static SerializedProperty FindPropertySafe(this SerializedObject serializedObject, string name)
+        {
+            string safeName = name;
+            if (name[0] == '_')
+            {
+                safeName = name.Substring(1);
+            }
+
+            return serializedObject.FindProperty(safeName);
+        }
     }
 }
diff --git a/Editor/UniRecast.Editor/UniRcJumpLinkBuilderToolEditor.cs b/Editor/UniRecast.Editor/UniRcJumpLinkBuilderToolEditor.cs
@@ -1,8 +1,8 @@
-namespace UniRecast.Editor
-{
-    using UniRecast.Toolsets;
-    using UnityEditor;
+using UniRecast.Toolsets;
+using UnityEditor;
 
+namespace UniRecast.Editor
+{
     [CustomEditor(typeof(UniRcJumpLinkBuilderTool))]
     public class UniRcJumpLinkBuilderToolEditor : UniRcToolEditor
     {
@@ -11,6 +11,5 @@ protected override void Layout()
             UniRcGui.Text(this.GetType().Name);
             UniRcGui.Separator();
         }
-
     }
 }
diff --git a/Editor/UniRecast.Editor/UniRcNavMeshSurfaceEditor.cs b/Editor/UniRecast.Editor/UniRcNavMeshSurfaceEditor.cs
@@ -1,13 +1,12 @@
 using UniRecast.Core;
+using DotRecast.Detour;
+using DotRecast.Recast.Toolset;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Rendering;
 
 namespace UniRecast.Editor
 {
-    using DotRecast.Detour;
-    using DotRecast.Recast.Toolset;
-    using UnityEditor;
-    using UnityEngine;
-    using UnityEngine.Rendering;
-
     [CanEditMultipleObjects]
     [CustomEditor(typeof(UniRcNavMeshSurface))]
     public class UniRcNavMeshSurfaceEditor : UniRcToolEditor
@@ -232,9 +231,9 @@ protected override void Layout()
                 EditorGUI.ObjectField(rectLabel, _navMeshData, GUIContent.none);
                 EditorGUI.EndProperty();
             }
-            
+
             UniRcGui.NewLine();
-            
+
             serializedObject.ApplyModifiedProperties();
 
             using (new EditorGUI.DisabledScope(Application.isPlaying))

diff --git a/Editor/UniRecast.Editor/UniRcObstacleToolEditor.cs b/Editor/UniRecast.Editor/UniRcObstacleToolEditor.cs
@@ -1,8 +1,8 @@
-namespace UniRecast.Editor
-{
-    using UniRecast.Toolsets;
-    using UnityEditor;
+using UnityEditor;
+using UniRecast.Toolsets;
 
+namespace UniRecast.Editor
+{
     [CustomEditor(typeof(UniRcObstacleTool))]
     public class UniRcObstacleToolEditor : UniRcToolEditor
     {

diff --git a/Editor/UniRecast.Editor/UniRcOffMeshConnectionToolEditor.cs b/Editor/UniRecast.Editor/UniRcOffMeshConnectionToolEditor.cs
@@ -1,9 +1,9 @@
-namespace UniRecast.Editor
-{
-    using UniRecast.Core;
-    using UniRecast.Toolsets;
-    using UnityEditor;
+using UniRecast.Core;
+using UniRecast.Toolsets;
+using UnityEditor;
 
+namespace UniRecast.Editor
+{
     [CustomEditor(typeof(UniRcOffMeshConnectionTool))]
     public class UniRcOffMeshConnectionToolEditor : UniRcToolEditor
     {

diff --git a/Editor/UniRecast.Editor/UniRcTestNavMeshToolEditor.cs b/Editor/UniRecast.Editor/UniRcTestNavMeshToolEditor.cs
@@ -1,13 +1,13 @@
-namespace UniRecast.Editor
+using System.Linq;
+using DotRecast.Detour;
+using DotRecast.Recast.Toolset.Builder;
+using DotRecast.Recast.Toolset.Tools;
+using UniRecast.Core;
+using UniRecast.Toolsets;
+using UnityEditor;
+
+namespace UniRecast.Editor
 {
-    using System.Linq;
-    using DotRecast.Detour;
-    using DotRecast.Recast.Toolset.Builder;
-    using DotRecast.Recast.Toolset.Tools;
-    using UniRecast.Core;
-    using UniRecast.Toolsets;
-    using UnityEditor;
-
     [CanEditMultipleObjects]
     [CustomEditor(typeof(UniRcTestNavMeshTool))]
     public class UniRcTestNavMeshToolEditor : UniRcToolEditor

diff --git a/Editor/UniRecast.Editor/UniRcTileToolEditor.cs b/Editor/UniRecast.Editor/UniRcTileToolEditor.cs
@@ -1,8 +1,8 @@
-namespace UniRecast.Editor
-{
-    using UniRecast.Toolsets;
-    using UnityEditor;
+using UniRecast.Toolsets;
+using UnityEditor;
 
+namespace UniRecast.Editor
+{
     [CustomEditor(typeof(UniRcTileTool))]
     public class UniRcTileToolEditor : UniRcToolEditor
     {
@@ -11,6 +11,5 @@ protected override void Layout()
             UniRcGui.Text(this.GetType().Name);
             UniRcGui.Separator();
         }
-
     }
 }
diff --git a/Editor/UniRecast.Editor/UniRcToolEditor.cs b/Editor/UniRecast.Editor/UniRcToolEditor.cs
@@ -1,9 +1,9 @@
-namespace UniRecast.Editor
-{
-    using UnityEditor;
-    using UnityEngine;
+using UnityEditor;
+using UnityEngine;
 
-    public class UniRcToolEditor : Editor
+namespace UniRecast.Editor
+{
+    public class UniRcToolEditor : UnityEditor.Editor
     {
         private void ProcessMouse()
         {
@@ -12,7 +12,7 @@ private void ProcessMouse()
             if (Event.current.type == EventType.MouseDown && Event.current.button == 0)
             {
                 Debug.Log("step 1");
-                
+
                 // 씬뷰에서의 마우스 위치를 가져옴
                 Vector2 mousePosition = Event.current.mousePosition;
 
@@ -34,7 +34,7 @@ private void OnSceneGUI()
         {
             ProcessMouse();
         }
-        
+
         // tool 
         public override void OnInspectorGUI()
         {
@@ -44,8 +44,6 @@ public override void OnInspectorGUI()
 
         protected virtual void Layout()
         {
-
         }
-
     }
 }
diff --git a/Editor/UniRecast.Editor/UniRcToolsetEditor.cs b/Editor/UniRecast.Editor/UniRcToolsetEditor.cs
@@ -1,17 +1,16 @@
-namespace UniRecast.Editor
-{
-    using UniRecast.Toolsets;
-    using UnityEditor;
-    using UnityEngine;
+using UniRecast.Toolsets;
+using UnityEditor;
+using UnityEngine;
 
+namespace UniRecast.Editor
+{
     [CanEditMultipleObjects]
     [CustomEditor(typeof(UniRcToolset))]
-    public class UniRcToolsetEditor : Editor
+    public class UniRcToolsetEditor : UnityEditor.Editor
     {
         private void OnSceneGUI()
         {
             Debug.Log("asdf");
         }
-
     }
 }
diff --git a/Runtime/UniRecast.Core/UniRcCamera.cs b/Runtime/UniRecast.Core/UniRcCamera.cs
@@ -1,7 +1,7 @@
+using UnityEngine;
+
 namespace UniRecast.Core
 {
-    using UnityEngine;
-
     public static class KeyModState
     {
         public const int None = 0;

diff --git a/Runtime/UniRecast.Core/UniRcExtensions.cs b/Runtime/UniRecast.Core/UniRcExtensions.cs
@@ -1,14 +1,14 @@
-namespace UniRecast.Core
+using System.Collections.Generic;
+using System.IO;
+using DotRecast.Core;
+using DotRecast.Core.Numerics;
+using DotRecast.Detour;
+using DotRecast.Detour.Io;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+namespace UniRecast.Core
 {
-    using System.Collections.Generic;
-    using System.IO;
-    using DotRecast.Core;
-    using DotRecast.Core.Numerics;
-    using DotRecast.Detour;
-    using DotRecast.Detour.Io;
-    using UnityEngine;
-    using UnityEngine.Rendering;
-
     // https://github.com/highfidelity/unity-to-hifi-exporter/blob/master/Assets/UnityToHiFiExporter/Editor/TerrainObjExporter.cs
     public static class UniRcExtensions
     {

diff --git a/Runtime/UniRecast.Core/UniRcGameObjectExtensions.cs b/Runtime/UniRecast.Core/UniRcGameObjectExtensions.cs
@@ -1,8 +1,8 @@
-namespace UniRecast.Core
-{
-    using System.Collections.Generic;
-    using UnityEngine;
+using System.Collections.Generic;
+using UnityEngine;
 
+namespace UniRecast.Core
+{
     public static class UniRcGameObjectExtensions
     {
         public static List<GameObject> ToHierarchyList(this GameObject root)

diff --git a/Runtime/UniRecast.Core/UniRcMesh.cs b/Runtime/UniRecast.Core/UniRcMesh.cs
@@ -1,16 +1,16 @@
-namespace UniRecast.Core
-{
-    using System;
-    using System.IO;
-    using System.Text;
-    using DotRecast.Core;
-    using DotRecast.Core.Numerics;
-    using DotRecast.Detour;
-    using DotRecast.Recast.Toolset;
-    using DotRecast.Recast.Toolset.Builder;
-    using DotRecast.Recast.Toolset.Geom;
-    using UnityEngine;
+using System;
+using System.IO;
+using System.Text;
+using DotRecast.Core;
+using DotRecast.Core.Numerics;
+using DotRecast.Detour;
+using DotRecast.Recast.Toolset;
+using DotRecast.Recast.Toolset.Builder;
+using DotRecast.Recast.Toolset.Geom;
+using UnityEngine;
 
+namespace UniRecast.Core
+{
     public readonly struct UniRcMesh
     {
         public readonly string Name;

diff --git a/Runtime/UniRecast.Core/UniRcNavMesh.cs b/Runtime/UniRecast.Core/UniRcNavMesh.cs