Adjust icons

unity-atoms · Jun 16, 2019 · bcdb8f1 · bcdb8f1
1 parent cb6280a
commit bcdb8f1
Show file tree

Hide file tree

Showing 21 changed files with 903 additions and 21 deletions.
diff --git a/Source/Actions/GetUnusedGameObject.cs → Source/Functions/GetUnusedGameObject.cs b/Source/Actions/GetUnusedGameObject.cs → Source/Functions/GetUnusedGameObject.cs
diff --git a/Source/Actions/GetUnusedGameObject.cs.meta → Source/Functions/GetUnusedGameObject.cs.meta b/Source/Actions/GetUnusedGameObject.cs.meta → Source/Functions/GetUnusedGameObject.cs.meta
diff --git a/Source/Functions/ScriptableObjectFunction.cs b/Source/Functions/ScriptableObjectFunction.cs
@@ -25,7 +25,7 @@ public GameFunction<R> SetFunc(Func<R> func)
         }
     }
 
-    public abstract class GameFunction<R, T1> : ScriptableObject
+    public abstract class GameFunction<R, T1> : ScriptableObject, IFunctionIcon
     {
         [HideInInspector]
         public Func<T1, R> Func;
@@ -47,7 +47,7 @@ public virtual R Call(T1 t1)
         }
     }
 
-    public abstract class GameFunction<R, T1, T2> : ScriptableObject
+    public abstract class GameFunction<R, T1, T2> : ScriptableObject, IFunctionIcon
     {
         [HideInInspector]
         public Func<T1, T2, R> Func;
@@ -69,7 +69,7 @@ public virtual R Call(T1 t1, T2 t2)
         }
     }
 
-    public abstract class GameFunction<R, T1, T2, T3> : ScriptableObject
+    public abstract class GameFunction<R, T1, T2, T3> : ScriptableObject, IFunctionIcon
     {
         [HideInInspector]
         public Func<T1, T2, T3, R> Func;
@@ -91,7 +91,7 @@ public virtual R Call(T1 t1, T2 t2, T3 t3)
         }
     }
 
-    public abstract class GameFunction<R, T1, T2, T3, T4> : ScriptableObject
+    public abstract class GameFunction<R, T1, T2, T3, T4> : ScriptableObject, IFunctionIcon
     {
         [HideInInspector]
         public Func<T1, T2, T3, T4, R> Func;
@@ -113,7 +113,7 @@ public virtual R Call(T1 t1, T2 t2, T3 t3, T4 t4)
         }
     }
 
-    public abstract class GameFunction<R, T1, T2, T3, T4, T5> : ScriptableObject
+    public abstract class GameFunction<R, T1, T2, T3, T4, T5> : ScriptableObject, IFunctionIcon
     {
         [HideInInspector]
         public Func<T1, T2, T3, T4, T5, R> Func;

diff --git a/Source/IconAssignmentPostProcessor/AtomsIconAssignmentProcessor.cs b/Source/IconAssignmentPostProcessor/AtomsIconAssignmentProcessor.cs
@@ -37,28 +37,29 @@ internal class AtomMonoScriptAssigner : IconAssigner<MonoScript>
                     }
                     else if (typeof(IVariableIcon).IsAssignableFrom(type))
                     {
-                        return icons.FirstOrDefault((icon) => icon.Name == "atom-icon-orange");
+                        return icons.FirstOrDefault((icon) => icon.Name == "atom-icon-lush");
                     }
                     else if (typeof(IConstantIcon).IsAssignableFrom(type))
                     {
                         return icons.FirstOrDefault((icon) => icon.Name == "atom-icon-teal");
                     }
                     else if (typeof(IEventIcon).IsAssignableFrom(type))
                     {
-                        return icons.FirstOrDefault((icon) => icon.Name == "atom-icon-teal");
+                        return icons.FirstOrDefault((icon) => icon.Name == "atom-icon-cherry");
                     }
                     else if (typeof(IFunctionIcon).IsAssignableFrom(type))
                     {
-                        return icons.FirstOrDefault((icon) => icon.Name == "atom-icon-lush");
+                        return icons.FirstOrDefault((icon) => icon.Name == "atom-icon-sand");
                     }
                     else if (typeof(IListenerIcon).IsAssignableFrom(type))
                     {
                         return icons.FirstOrDefault((icon) => icon.Name == "atom-icon-piglet");
                     }
                     else if (typeof(IListIcon).IsAssignableFrom(type))
                     {
-                        return icons.FirstOrDefault((icon) => icon.Name == "atom-icon-pinky");
+                        return icons.FirstOrDefault((icon) => icon.Name == "atom-icon-orange");
                     }
+                    return icons.FirstOrDefault((icon) => icon.Name == "atom-icon-delicate");
                 }
 
                 return null;

diff --git a/Source/IconAssignmentPostProcessor/IIconAssigner.cs b/Source/IconAssignmentPostProcessor/IIconAssigner.cs
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using UnityEngine;
 
 namespace UnityAtoms
 {

diff --git a/Source/IconAssignmentPostProcessor/IconAssigmentSetting.cs b/Source/IconAssignmentPostProcessor/IconAssigmentSetting.cs
@@ -1,5 +1,4 @@
 using System;
-using UnityEngine;
 
 namespace UnityAtoms
 {

diff --git a/Source/IconAssignmentPostProcessor/IconAssigmentSettings.cs b/Source/IconAssignmentPostProcessor/IconAssigmentSettings.cs
@@ -69,7 +69,7 @@ public void LoadFromFile()
             }
             catch (Exception e)
             {
-                Debug.Log("No Settings Loaded: " + e.Message);
+                Debug.LogError("No Settings Loaded: " + e.Message);
             }
         }
 

diff --git a/Source/IconAssignmentPostProcessor/IconAssigner.cs b/Source/IconAssignmentPostProcessor/IconAssigner.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Reflection;
 using System.Collections.Generic;
-using UnityEngine;
 using UnityEditor;
 
 namespace UnityAtoms

diff --git a/Source/IconAssignmentPostProcessor/IconAssignmentPostprocessor.cs b/Source/IconAssignmentPostProcessor/IconAssignmentPostprocessor.cs
@@ -1,10 +1,4 @@
-using System;
-using System.IO;
-using System.Collections.Generic;
-using UnityEngine;
 using UnityEditor;
-using System.Reflection;
-using UnityAtoms;
 
 namespace UnityAtoms
 {

diff --git a/Source/IconMap/atom-icon-cherry.png b/Source/IconMap/atom-icon-cherry.png
diff --git a/Source/IconMap/atom-icon-delicate.png b/Source/IconMap/atom-icon-delicate.png
diff --git a/Source/IconMap/atom-icon-pinky.png.meta → Source/IconMap/atom-icon-delicate.png.meta b/Source/IconMap/atom-icon-pinky.png.meta → Source/IconMap/atom-icon-delicate.png.meta
diff --git a/Source/IconMap/atom-icon-lush.png b/Source/IconMap/atom-icon-lush.png
diff --git a/Source/IconMap/atom-icon-orange.png b/Source/IconMap/atom-icon-orange.png
diff --git a/Source/IconMap/atom-icon-piglet.png b/Source/IconMap/atom-icon-piglet.png
diff --git a/Source/IconMap/atom-icon-pinky.png b/Source/IconMap/atom-icon-pinky.png
diff --git a/Source/IconMap/atom-icon-purple.png b/Source/IconMap/atom-icon-purple.png
diff --git a/Source/IconMap/atom-icon-sand.png b/Source/IconMap/atom-icon-sand.png
diff --git a/Source/IconMap/atom-icon-sand.png.meta b/Source/IconMap/atom-icon-sand.png.meta
diff --git a/Source/IconMap/atom-icon-teal.png b/Source/IconMap/atom-icon-teal.png