support hierarchy in shader template pull-down menu.

hecomi · Dec 29, 2017 · e3d1a6a · e3d1a6a
1 parent 730b274
commit e3d1a6a
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 6 deletions.
diff --git a/Assets/uShaderTemplate/Editor/Scripts/Common.cs b/Assets/uShaderTemplate/Editor/Scripts/Common.cs
@@ -36,6 +36,7 @@ public static class Setting
     public const string menuPlace = "Shader/uShaderTemplate/";
     public const string defaultConstants = "uShaderTemplate/Default Constants";
     public const string templateDirectoryPath = "ShaderTemplates";
+    public const string templateFileExtension = ".txt";
 }
 
 }

diff --git a/Assets/uShaderTemplate/Editor/Scripts/ShaderTemplateSelector.cs b/Assets/uShaderTemplate/Editor/Scripts/ShaderTemplateSelector.cs
@@ -45,11 +45,14 @@ public ShaderTemplateSelector(SerializedProperty prop)
 
         var paths = Utils.GetShaderTemplatePathList();
         foreach (var path in paths) {
-            if (Path.GetExtension(path) == ".txt") {
-                var name = Path.GetFileNameWithoutExtension(path);
+            if (Path.GetExtension(path) == Common.Setting.templateFileExtension) {
+                var index = path.IndexOf(Common.Setting.templateDirectoryPath);
+                var name = path
+                    .Substring(index + Common.Setting.templateDirectoryPath.Length + 1)
+                    .Replace(Common.Setting.templateFileExtension, "");
                 var info = new TemplateInfo() {
                     name = name,
-                    path = path
+                    path = path,
                 };
                 list_.Add(info);
             }
@@ -69,8 +72,8 @@ public void Draw()
             var selected = list_[selectedIndex];
 
             var openButtonStyle = EditorStyles.miniButton;
-            openButtonStyle.fixedWidth = 40;
-            if (GUILayout.Button("Open", openButtonStyle)) {
+            openButtonStyle.fixedWidth = 36;
+            if (GUILayout.Button("Edit", openButtonStyle)) {
                 var asset = AssetDatabase.LoadAssetAtPath(selected.path, typeof(Object));
                 AssetDatabase.OpenAsset(asset);
             }

diff --git a/Assets/uShaderTemplate/Examples/Editor/Generators/Surface.asset b/Assets/uShaderTemplate/Examples/Editor/Generators/Surface.asset
diff --git a/Assets/uShaderTemplate/Examples/Editor/Generators/VertFrag.asset b/Assets/uShaderTemplate/Examples/Editor/Generators/VertFrag.asset
diff --git a/Assets/uShaderTemplate/Examples/Editor/Resources/ShaderTemplates/Examples.meta b/Assets/uShaderTemplate/Examples/Editor/Resources/ShaderTemplates/Examples.meta
diff --git a/.../Resources/ShaderTemplates/2. Surface.txt → ...rces/ShaderTemplates/Examples/Surface.txt b/.../Resources/ShaderTemplates/2. Surface.txt → ...rces/ShaderTemplates/Examples/Surface.txt
diff --git a/...urces/ShaderTemplates/2. Surface.txt.meta → ...ShaderTemplates/Examples/Surface.txt.meta b/...urces/ShaderTemplates/2. Surface.txt.meta → ...ShaderTemplates/Examples/Surface.txt.meta
diff --git a/...Resources/ShaderTemplates/1. VertFrag.txt → ...ces/ShaderTemplates/Examples/VertFrag.txt b/...Resources/ShaderTemplates/1. VertFrag.txt → ...ces/ShaderTemplates/Examples/VertFrag.txt
diff --git a/...rces/ShaderTemplates/1. VertFrag.txt.meta → ...haderTemplates/Examples/VertFrag.txt.meta b/...rces/ShaderTemplates/1. VertFrag.txt.meta → ...haderTemplates/Examples/VertFrag.txt.meta
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.1.0b6
+m_EditorVersion: 2017.3.0f3