KenSchae
/
fungus
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #568 from zvinless/icons 

Editor resource loading modifications
master
Chris Gregan 8 years ago committed by GitHub
parent
0f6f46acb2 88ffa62c3f
commit
3409cf883a
5 changed files with 264 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      Assets/AssetStoreTools/Editor/AssetStoreTools.dll.meta
  2. 62
      Assets/Fungus/EditorResources/FungusEditorResources.asset
  3. 8
      Assets/Fungus/EditorResources/FungusEditorResources.asset.meta
  4. 195
      Assets/Fungus/Scripts/Editor/FungusEditorResources.cs
  5. 68
      Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs

10
Assets/AssetStoreTools/Editor/AssetStoreTools.dll.meta
Unescape View File

@ -7,8 +7,16 @@ PluginImporter:
isPreloaded: 0 isPreloaded: 0
platformData: platformData:
Any: Any:
enabled: 1 enabled: 0
settings: {} settings: {}
Editor:
enabled: 1
settings:
DefaultValueInitialized: true
WindowsStoreApps:
enabled: 0
settings:
CPU: AnyCPU
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

62
Assets/Fungus/EditorResources/FungusEditorResources.asset
Unescape View File

@ -0,0 +1,62 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d2af387304e4b454b9ce8b815799cad0, type: 3}
m_Name: FungusEditorResources
m_EditorClassIdentifier:
updateOnReloadScripts: 0
add:
free: {fileID: 2800000, guid: 24a867d6b4cdda04cb3aa3350f9ec7d0, type: 3}
pro: {fileID: 2800000, guid: 4e43c476b4a7a49a08c37378fb01ce99, type: 3}
add_small:
free: {fileID: 2800000, guid: 288aff1a0e5c14fd3a0039d24149df73, type: 3}
pro: {fileID: 2800000, guid: 64534dfaa17844231a9a9dd2df89d0db, type: 3}
delete:
free: {fileID: 2800000, guid: d6fc8a97e8a5b0947a49b780f787e504, type: 3}
pro: {fileID: 2800000, guid: 29c4d29b1678042a5b3516c732ccc507, type: 3}
down:
free: {fileID: 2800000, guid: 51a973f446c2e664582861480cce6215, type: 3}
pro: {fileID: 2800000, guid: 5a87a7d3683164a238377d948572805f, type: 3}
duplicate:
free: {fileID: 2800000, guid: c97f334c466215a4f93eff31de3c1591, type: 3}
pro: {fileID: 2800000, guid: 2f17490d993c84bd7872ef6588ffba47, type: 3}
up:
free: {fileID: 2800000, guid: 8f1242ad894201f43b2b6d52fd990f77, type: 3}
pro: {fileID: 2800000, guid: 2a76a781db2994b33b83cd84b8835da7, type: 3}
choice_node_off:
free: {fileID: 2800000, guid: 7b6fc04aac74540e39e9502da5312ce7, type: 3}
pro: {fileID: 0}
choice_node_on:
free: {fileID: 2800000, guid: cfc05494b71a0446182868aab5f7febf, type: 3}
pro: {fileID: 0}
command_background:
free: {fileID: 2800000, guid: a5c9a4271b3de4e4f86eff7f8a1bd768, type: 3}
pro: {fileID: 0}
connection_point:
free: {fileID: 2800000, guid: f08a4c27d7efe4aa6a35348a4e8aec8f, type: 3}
pro: {fileID: 0}
event_node_off:
free: {fileID: 2800000, guid: 0e16a209826864df7b05f6d3901aae7a, type: 3}
pro: {fileID: 0}
event_node_on:
free: {fileID: 2800000, guid: 9434488a4efb54da5986eba5d5619baf, type: 3}
pro: {fileID: 0}
play_big:
free: {fileID: 2800000, guid: bff2ba39f5f4448589e80522ebfcd0a0, type: 3}
pro: {fileID: 0}
play_small:
free: {fileID: 2800000, guid: a48a2b9b06deb469d9da1777b094521b, type: 3}
pro: {fileID: 0}
process_node_off:
free: {fileID: 2800000, guid: ea3a4228e6c214149bfe5c741b56ae0c, type: 3}
pro: {fileID: 0}
process_node_on:
free: {fileID: 2800000, guid: c2dceb780784240ccbe8d3cde89f7671, type: 3}
pro: {fileID: 0}

8
Assets/Fungus/EditorResources/FungusEditorResources.asset.meta
Unescape View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 29cae11326cb84802b83fc3ff25a47e8
timeCreated: 1478978272
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:

195
Assets/Fungus/Scripts/Editor/FungusEditorResources.cs
Unescape View File

@ -3,65 +3,132 @@
using UnityEngine; using UnityEngine;
using UnityEditor; using UnityEditor;
using UnityEditor.Callbacks;
using System; using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
#if UNITY_5_0 || UNITY_5_1
using System.Reflection;
#endif
namespace Fungus.EditorUtils namespace Fungus.EditorUtils
{ {
internal static partial class FungusEditorResources [CustomEditor(typeof(FungusEditorResources))]
internal class FungusEditorResourcesInspector : Editor
{ {
private static Dictionary<string, Texture2D> textures = new Dictionary<string, Texture2D>(); public override void OnInspectorGUI()
private static readonly string editorResourcesFolderName = "\"EditorResources\"";
static FungusEditorResources()
{ {
LoadTexturesFromNames(); if (serializedObject.FindProperty("updateOnReloadScripts").boolValue)
{
GUILayout.Label("Updating...");
}
else
{
if (GUILayout.Button("Sync with EditorResources folder"))
{
FungusEditorResources.GenerateResourcesScript();
}
DrawDefaultInspector();
}
} }
}
private static void LoadTexturesFromNames() // Handle reimporting all assets
internal class EditorResourcesPostProcessor : AssetPostprocessor
{
private static void OnPostprocessAllAssets(string[] importedAssets, string[] _, string[] __, string[] ___)
{ {
var baseDirectories = AssetDatabase.FindAssets(editorResourcesFolderName).Select( foreach (var path in importedAssets)
guid => AssetDatabase.GUIDToAssetPath(guid)
).ToArray();
foreach (var name in resourceNames)
{ {
LoadTexturesFromGUIDs(AssetDatabase.FindAssets(name + " t:Texture2D", baseDirectories)); if (path.EndsWith("FungusEditorResources.asset"))
{
var asset = AssetDatabase.LoadAssetAtPath(path, typeof(FungusEditorResources)) as FungusEditorResources;
if (asset != null)
{
FungusEditorResources.UpdateTextureReferences(asset);
AssetDatabase.SaveAssets();
return;
}
}
} }
} }
}
private static void LoadAllTexturesInFolder() internal partial class FungusEditorResources : ScriptableObject
{
[Serializable]
internal class EditorTexture
{ {
var rootGuid = AssetDatabase.FindAssets(editorResourcesFolderName)[0]; [SerializeField] private Texture2D free;
var root = AssetDatabase.GUIDToAssetPath(rootGuid); [SerializeField] private Texture2D pro;
LoadTexturesFromGUIDs(AssetDatabase.FindAssets("t:Texture2D", new [] { root }));
public Texture2D Texture2D
{
get { return EditorGUIUtility.isProSkin && pro != null ? pro : free; }
}
public EditorTexture(Texture2D free, Texture2D pro)
{
this.free = free;
this.pro = pro;
}
} }
private static void LoadTexturesFromGUIDs(string[] guids) private static FungusEditorResources instance;
{ private static readonly string editorResourcesFolderName = "\"EditorResources\"";
var paths = guids.Select(guid => AssetDatabase.GUIDToAssetPath(guid)).OrderBy(path => path.ToLower().Contains("/pro/")); [SerializeField] [HideInInspector] private bool updateOnReloadScripts = false;
foreach (var path in paths) internal static FungusEditorResources Instance
{
get
{ {
if (path.ToLower().Contains("/pro/") && !EditorGUIUtility.isProSkin) if (instance == null)
{ {
return; var guids = AssetDatabase.FindAssets("FungusEditorResources t:FungusEditorResources");
if (guids.Length == 0)
{
instance = ScriptableObject.CreateInstance(typeof(FungusEditorResources)) as FungusEditorResources;
AssetDatabase.CreateAsset(instance, GetRootFolder() + "/FungusEditorResources.asset");
}
else
{
if (guids.Length > 1)
{
Debug.LogWarning("Multiple FungusEditorResources assets found!");
}
var path = AssetDatabase.GUIDToAssetPath(guids[0]);
instance = AssetDatabase.LoadAssetAtPath(path, typeof(FungusEditorResources)) as FungusEditorResources;
}
} }
var texture = AssetDatabase.LoadAssetAtPath(path, typeof(Texture2D)) as Texture2D;
textures[texture.name] = texture; return instance;
} }
} }
[MenuItem("Tools/Fungus/Utilities/Update Editor Resources Script")] private static string GetRootFolder()
private static void GenerateResourcesScript() {
var rootGuid = AssetDatabase.FindAssets(editorResourcesFolderName)[0];
return AssetDatabase.GUIDToAssetPath(rootGuid);
}
internal static void GenerateResourcesScript()
{ {
textures.Clear(); // Get all unique filenames
LoadAllTexturesInFolder(); var textureNames = new HashSet<string>();
var guids = AssetDatabase.FindAssets("t:Texture2D", new [] { GetRootFolder() });
var paths = guids.Select(guid => AssetDatabase.GUIDToAssetPath(guid));
foreach (var path in paths)
{
textureNames.Add(Path.GetFileNameWithoutExtension(path));
}
var guid = AssetDatabase.FindAssets("FungusEditorResources t:MonoScript")[0]; var scriptGuid = AssetDatabase.FindAssets("FungusEditorResources t:MonoScript")[0];
var relativePath = AssetDatabase.GUIDToAssetPath(guid).Replace("FungusEditorResources.cs", "FungusEditorResourcesGenerated.cs"); var relativePath = AssetDatabase.GUIDToAssetPath(scriptGuid).Replace("FungusEditorResources.cs", "FungusEditorResourcesGenerated.cs");
var absolutePath = Application.dataPath + relativePath.Substring("Assets".Length); var absolutePath = Application.dataPath + relativePath.Substring("Assets".Length);
using (var writer = new StreamWriter(absolutePath)) using (var writer = new StreamWriter(absolutePath))
@ -73,43 +140,83 @@ namespace Fungus.EditorUtils
writer.WriteLine(""); writer.WriteLine("");
writer.WriteLine("namespace Fungus.EditorUtils"); writer.WriteLine("namespace Fungus.EditorUtils");
writer.WriteLine("{"); writer.WriteLine("{");
writer.WriteLine(" internal static partial class FungusEditorResources"); writer.WriteLine(" internal partial class FungusEditorResources : ScriptableObject");
writer.WriteLine(" {"); writer.WriteLine(" {");
writer.WriteLine(" private static readonly string[] resourceNames = new [] {");
foreach (var pair in textures) foreach (var name in textureNames)
{ {
writer.WriteLine(" \"" + pair.Key + "\","); writer.WriteLine(" [SerializeField] private EditorTexture " + name + ";");
} }
writer.WriteLine(" };");
writer.WriteLine(""); writer.WriteLine("");
foreach (var pair in textures) foreach (var name in textureNames)
{ {
var name = pair.Key;
var pascalCase = string.Join("", name.Split(new [] { '_' }, StringSplitOptions.RemoveEmptyEntries).Select( var pascalCase = string.Join("", name.Split(new [] { '_' }, StringSplitOptions.RemoveEmptyEntries).Select(
s => s.Substring(0, 1).ToUpper() + s.Substring(1)).ToArray() s => s.Substring(0, 1).ToUpper() + s.Substring(1)).ToArray()
); );
writer.WriteLine(" public static Texture2D " + pascalCase + " { get { return GetTexture(\"" + name + "\"); } }"); writer.WriteLine(" public static Texture2D " + pascalCase + " { get { return Instance." + name + ".Texture2D; } }");
} }
writer.WriteLine(" }"); writer.WriteLine(" }");
writer.WriteLine("}"); writer.WriteLine("}");
} }
Instance.updateOnReloadScripts = true;
AssetDatabase.ImportAsset(relativePath); AssetDatabase.ImportAsset(relativePath);
} }
private static Texture2D GetTexture(string name) [DidReloadScripts]
private static void OnDidReloadScripts()
{ {
Texture2D texture; if (Instance.updateOnReloadScripts)
if (!textures.TryGetValue(name, out texture))
{ {
Debug.LogWarning("Texture \"" + name + "\" not found!"); UpdateTextureReferences(Instance);
} }
}
internal static void UpdateTextureReferences(FungusEditorResources instance)
{
// Iterate through all fields in instance and set texture references
var serializedObject = new SerializedObject(instance);
var prop = serializedObject.GetIterator();
var rootFolder = new [] { GetRootFolder() };
prop.NextVisible(true);
while (prop.NextVisible(false))
{
if (prop.propertyType == SerializedPropertyType.Generic)
{
var guids = AssetDatabase.FindAssets(prop.name + " t:Texture2D", rootFolder);
var paths = guids.Select(guid => AssetDatabase.GUIDToAssetPath(guid)).Where(
path => path.Contains(prop.name + ".")
);
foreach (var path in paths)
{
var texture = AssetDatabase.LoadAssetAtPath(path, typeof(Texture2D)) as Texture2D;
if (path.ToLower().Contains("/pro/"))
{
prop.FindPropertyRelative("pro").objectReferenceValue = texture;
}
else
{
prop.FindPropertyRelative("free").objectReferenceValue = texture;
}
}
}
}
serializedObject.FindProperty("updateOnReloadScripts").boolValue = false;
return texture; // The ApplyModifiedPropertiesWithoutUndo() function wasn't documented until Unity 5.2
#if UNITY_5_0 || UNITY_5_1
var flags = BindingFlags.Instance | BindingFlags.NonPublic;
var applyMethod = typeof(SerializedObject).GetMethod("ApplyModifiedPropertiesWithoutUndo", flags);
applyMethod.Invoke(serializedObject, null);
#else
serializedObject.ApplyModifiedPropertiesWithoutUndo();
#endif
} }
} }
} }

68
Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs
Unescape View File

@ -5,42 +5,40 @@ using UnityEngine;
namespace Fungus.EditorUtils namespace Fungus.EditorUtils
{ {
internal static partial class FungusEditorResources internal partial class FungusEditorResources : ScriptableObject
{ {
private static readonly string[] resourceNames = new [] { [SerializeField] private EditorTexture add;
"add", [SerializeField] private EditorTexture add_small;
"add_small", [SerializeField] private EditorTexture delete;
"delete", [SerializeField] private EditorTexture down;
"down", [SerializeField] private EditorTexture duplicate;
"duplicate", [SerializeField] private EditorTexture up;
"up", [SerializeField] private EditorTexture choice_node_off;
"choice_node_off", [SerializeField] private EditorTexture choice_node_on;
"choice_node_on", [SerializeField] private EditorTexture command_background;
"command_background", [SerializeField] private EditorTexture connection_point;
"connection_point", [SerializeField] private EditorTexture event_node_off;
"event_node_off", [SerializeField] private EditorTexture event_node_on;
"event_node_on", [SerializeField] private EditorTexture play_big;
"play_big", [SerializeField] private EditorTexture play_small;
"play_small", [SerializeField] private EditorTexture process_node_off;
"process_node_off", [SerializeField] private EditorTexture process_node_on;
"process_node_on",
};
public static Texture2D Add { get { return GetTexture("add"); } } public static Texture2D Add { get { return Instance.add.Texture2D; } }
public static Texture2D AddSmall { get { return GetTexture("add_small"); } } public static Texture2D AddSmall { get { return Instance.add_small.Texture2D; } }
public static Texture2D Delete { get { return GetTexture("delete"); } } public static Texture2D Delete { get { return Instance.delete.Texture2D; } }
public static Texture2D Down { get { return GetTexture("down"); } } public static Texture2D Down { get { return Instance.down.Texture2D; } }
public static Texture2D Duplicate { get { return GetTexture("duplicate"); } } public static Texture2D Duplicate { get { return Instance.duplicate.Texture2D; } }
public static Texture2D Up { get { return GetTexture("up"); } } public static Texture2D Up { get { return Instance.up.Texture2D; } }
public static Texture2D ChoiceNodeOff { get { return GetTexture("choice_node_off"); } } public static Texture2D ChoiceNodeOff { get { return Instance.choice_node_off.Texture2D; } }
public static Texture2D ChoiceNodeOn { get { return GetTexture("choice_node_on"); } } public static Texture2D ChoiceNodeOn { get { return Instance.choice_node_on.Texture2D; } }
public static Texture2D CommandBackground { get { return GetTexture("command_background"); } } public static Texture2D CommandBackground { get { return Instance.command_background.Texture2D; } }
public static Texture2D ConnectionPoint { get { return GetTexture("connection_point"); } } public static Texture2D ConnectionPoint { get { return Instance.connection_point.Texture2D; } }
public static Texture2D EventNodeOff { get { return GetTexture("event_node_off"); } } public static Texture2D EventNodeOff { get { return Instance.event_node_off.Texture2D; } }
public static Texture2D EventNodeOn { get { return GetTexture("event_node_on"); } } public static Texture2D EventNodeOn { get { return Instance.event_node_on.Texture2D; } }
public static Texture2D PlayBig { get { return GetTexture("play_big"); } } public static Texture2D PlayBig { get { return Instance.play_big.Texture2D; } }
public static Texture2D PlaySmall { get { return GetTexture("play_small"); } } public static Texture2D PlaySmall { get { return Instance.play_small.Texture2D; } }
public static Texture2D ProcessNodeOff { get { return GetTexture("process_node_off"); } } public static Texture2D ProcessNodeOff { get { return Instance.process_node_off.Texture2D; } }
public static Texture2D ProcessNodeOn { get { return GetTexture("process_node_on"); } } public static Texture2D ProcessNodeOn { get { return Instance.process_node_on.Texture2D; } }
} }
} }

Write Preview
Loading…
Cancel
Save