diff --git a/.idea/.idea.AsmdefHelper/.idea/workspace.xml b/.idea/.idea.AsmdefHelper/.idea/workspace.xml
index 99badee..9cffde1 100644
--- a/.idea/.idea.AsmdefHelper/.idea/workspace.xml
+++ b/.idea/.idea.AsmdefHelper/.idea/workspace.xml
@@ -3,6 +3,15 @@
+
+
+
+
+
+
+
+
+
@@ -15,15 +24,30 @@
+
+
+
+
+
+
@@ -40,6 +64,12 @@
+
+
+
+
+
+
@@ -81,7 +111,7 @@
-
+
diff --git a/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefDependency.cs b/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefDependency.cs
index d2eec00..daeaad0 100644
--- a/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefDependency.cs
+++ b/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefDependency.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace AsmdefGraph.Editor {
+namespace AsmdefHelper.DependencyGraph.Editor {
public class AsmdefDependency {
public string DependsFrom { get; }
public IEnumerable DependsTo { get; }
diff --git a/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs b/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs
index ed9d1c9..10fd791 100644
--- a/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs
+++ b/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphEditorWindow.cs
@@ -3,7 +3,7 @@ using System.Linq;
using UnityEditor;
using UnityEditor.Compilation;
-namespace AsmdefGraph.Editor {
+namespace AsmdefHelper.DependencyGraph.Editor {
public class AsmdefGraphEditorWindow : EditorWindow {
[MenuItem("Window/Open Asmdef Graph Window")]
public static void Open() {
@@ -17,7 +17,7 @@ namespace AsmdefGraph.Editor {
foreach (var asmdef in asmdefs) {
allDependencies.Add(
new AsmdefDependency(
- asmdef.name,
+ asmdef.name,
asmdef.assemblyReferences?.Select(x => x.name) ?? new string[0])
);
}
diff --git a/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphView.cs b/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphView.cs
index de9391e..1a79c87 100644
--- a/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphView.cs
+++ b/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefGraphView.cs
@@ -1,9 +1,8 @@
using System.Collections.Generic;
-using System.Linq;
using UnityEditor.Experimental.GraphView;
using UnityEngine.UIElements;
-namespace AsmdefGraph.Editor {
+namespace AsmdefHelper.DependencyGraph.Editor {
public class AsmdefGraphView : GraphView {
public AsmdefGraphView(IEnumerable asmdefs) : base() {
// zoom可能に
diff --git a/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefNode.cs b/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefNode.cs
index f07b2b4..af9deb8 100644
--- a/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefNode.cs
+++ b/Assets/AsmdefHelper/DependencyGraph/Editor/AsmdefNode.cs
@@ -1,6 +1,6 @@
using UnityEditor.Experimental.GraphView;
-namespace AsmdefGraph.Editor {
+namespace AsmdefHelper.DependencyGraph.Editor {
public class AsmdefNode : Node {
public readonly Port LeftPort;
public readonly Port RightPort;
diff --git a/Assets/AsmdefHelper/Example/Fuga/NewBehaviourScript.cs b/Assets/AsmdefHelper/Example/Fuga/NewBehaviourScript.cs
index 3f0ce2b..4dfbd09 100644
--- a/Assets/AsmdefHelper/Example/Fuga/NewBehaviourScript.cs
+++ b/Assets/AsmdefHelper/Example/Fuga/NewBehaviourScript.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
-namespace AsmdefGraph.Example.Fuga {
+namespace AsmdefHelper.Example.Fuga {
public class NewBehaviourScript : MonoBehaviour {
// Start is called before the first frame update
void Start() {
diff --git a/Assets/AsmdefHelper/Example/Hoge/NewBehaviourScript.cs b/Assets/AsmdefHelper/Example/Hoge/NewBehaviourScript.cs
index 3c8a0b3..f7470c5 100644
--- a/Assets/AsmdefHelper/Example/Hoge/NewBehaviourScript.cs
+++ b/Assets/AsmdefHelper/Example/Hoge/NewBehaviourScript.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
-namespace AsmdefGraph.Example.Hoge {
+namespace AsmdefHelper.Example.Hoge {
public class NewBehaviourScript : MonoBehaviour {
// Start is called before the first frame update
void Start() {
diff --git a/Assets/AsmdefHelper/Example/NewBehaviourScript.cs b/Assets/AsmdefHelper/Example/NewBehaviourScript.cs
index dd6ece2..b1c35ee 100644
--- a/Assets/AsmdefHelper/Example/NewBehaviourScript.cs
+++ b/Assets/AsmdefHelper/Example/NewBehaviourScript.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
-namespace AsmdefGraph.Example {
+namespace AsmdefHelper.Example {
public class NewBehaviourScript : MonoBehaviour {
// Start is called before the first frame update
void Start() {
diff --git a/Assets/AsmdefHelper/Example/Piyo/NewBehaviourScript.cs b/Assets/AsmdefHelper/Example/Piyo/NewBehaviourScript.cs
index 9cadcba..9b6362a 100644
--- a/Assets/AsmdefHelper/Example/Piyo/NewBehaviourScript.cs
+++ b/Assets/AsmdefHelper/Example/Piyo/NewBehaviourScript.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using UnityEngine;
-namespace AsmdefGraph.Example.Piyo {
+namespace AsmdefHelper.Example.Piyo {
public class NewBehaviourScript : MonoBehaviour {
// Start is called before the first frame update
void Start() {
diff --git a/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs b/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs
index faaf72b..aa3b6be 100644
--- a/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs
+++ b/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs
@@ -5,32 +5,26 @@ using UnityEditor.Experimental.AssetImporters;
using UnityEditorInternal;
using UnityEngine;
-namespace AsmdefMultiEdit.Editor
-{
- public class AsmdefMultiEditWindow : EditorWindow
- {
+namespace AsmdefHelper.MultipleEdit.Editor {
+ public class AsmdefMultiEditWindow : EditorWindow {
static IList windows = new List();
- [MenuItem("Window/Asmdef Multiple Edit/1.Search asmdef in project")]
- public static void Search()
- {
+ [MenuItem("Window/Asmdef Helper/Multiple Edit/1.Search asmdef in project")]
+ public static void Search() {
var projectBrowser = GetWindow();
projectBrowser.SetSearch("t:AssemblyDefinitionAsset");
}
- [MenuItem("Window/Asmdef Multiple Edit/2.Open selected asmdef inspector view")]
- public static void Open()
- {
+ [MenuItem("Window/Asmdef Helper/Multiple Edit/2.Open selected asmdef inspector view")]
+ public static void Open() {
var asmdefs = Selection.GetFiltered(typeof(AssemblyDefinitionAsset), SelectionMode.TopLevel);
- if (!asmdefs.Any())
- {
+ if (!asmdefs.Any()) {
Debug.Log("no AssemblyDefinitionAsset");
return;
}
CloseWindows();
- foreach (var adf in asmdefs)
- {
+ foreach (var adf in asmdefs) {
Selection.objects = new[] { adf };
var w = CreateWindow();
// LockすることでInspectorWindowの表示を固定する
@@ -39,31 +33,28 @@ namespace AsmdefMultiEdit.Editor
}
}
- [MenuItem("Window/Asmdef Multiple Edit/3.All apply and close")]
- public static void Apply()
- {
- foreach (var w in windows)
- {
- foreach (var editor in w.tracker.activeEditors)
- {
+ [MenuItem("Window/Asmdef Helper/Multiple Edit/3.All apply and close")]
+ public static void Apply() {
+ foreach (var w in windows) {
+ foreach (var editor in w.tracker.activeEditors) {
var assetImporterEditor = editor as AssetImporterEditor;
- if (assetImporterEditor != null && assetImporterEditor.HasModified())
- {
+ if (assetImporterEditor != null && assetImporterEditor.HasModified()) {
assetImporterEditor.ApplyAndImport();
}
}
+
w.Close();
}
+
windows.Clear();
}
- static void CloseWindows()
- {
- foreach (var w in windows)
- {
+ static void CloseWindows() {
+ foreach (var w in windows) {
w.Close();
}
+
windows.Clear();
}
}
diff --git a/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs b/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs
index 15faa95..4a82579 100644
--- a/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs
+++ b/Assets/AsmdefHelper/SyncSolution/Editor/SyncSolutionUtilities.cs
@@ -7,7 +7,7 @@ using UnityEngine;
// https://forum.unity.com/threads/solved-unity-not-generating-sln-file-from-assets-open-c-project.538487/
// Thank you Flexford!
-namespace AsmdeffHelper.SyncSolution {
+namespace AsmdefHelper.SyncSolution.Editor {
public static class SyncSolutionUtilities {
static SolutionSynchronizer synchronizer;