jp.keijiro.klutter-tools 1.0.0 → 2.0.0

package/Editor/CubeLutImporter.cs

@@ -4,7 +4,7 @@ using System.IO;
 using UnityEditor.AssetImporters;
 using UnityEngine;
 
-namespace Klak.KlutterTools {
+namespace KlutterTools {
 
 #if !KLUTTER_TOOLS_HAS_HDRP
 
@@ -60,4 +60,4 @@ class CubeLutImporter : ScriptedImporter
 
 #endif
 
-} // namespace Klak.KlutterTools 
+} // namespace KlutterTools

package/Editor/FpsCapperSystem.cs

@@ -2,7 +2,7 @@ using UnityEditor;
 using UnityEngine;
 using System.Threading;
 
-namespace Klak.KlutterTools {
+namespace KlutterTools {
 
 // FPS Capper player loop sub system
 [InitializeOnLoad]
@@ -53,4 +53,4 @@ sealed class FpsCapperSystem
     }
 }
 
-} // namespace Klak.KlutterTools 
+} // namespace KlutterTools

package/Editor/InspectorUtils.cs

@@ -0,0 +1,71 @@
+using UnityEngine;
+using UnityEditor;
+using System.Reflection;
+using System.Linq;
+
+namespace KlutterTools.InspectorUtils {
+
+// String container providing GUIContent
+public struct LabelString
+{
+    GUIContent _guiContent;
+
+    public static implicit operator GUIContent(LabelString label)
+      => label._guiContent;
+
+    public static implicit operator LabelString(string text)
+      => new LabelString { _guiContent = new GUIContent(text) };
+}
+
+// Auto-scanning serialized property wrapper
+public struct AutoProperty
+{
+    SerializedProperty _prop;
+
+    public SerializedProperty Target
+      => _prop;
+
+    public AutoProperty(SerializedProperty prop)
+      => _prop = prop;
+
+    public static implicit operator AutoProperty(SerializedProperty prop)
+      => new AutoProperty(prop);
+
+    public static implicit operator SerializedProperty(AutoProperty prop)
+      => prop._prop;
+
+    public static void Scan<T>(T target) where T : UnityEditor.Editor
+    {
+        var so = target.serializedObject;
+
+        var allFields = typeof(T).GetFields
+          (BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+
+        var autoProps = allFields.Where(f => f.FieldType == typeof(AutoProperty));
+
+        foreach (var f in autoProps)
+            f.SetValue(target, new AutoProperty(FindProperty(so, f.Name)));
+    }
+
+    static string GetPropNameBacking(string name)
+      => $"<{name}>k__BackingField";
+
+    static string GetPropNameCamel(string name)
+      => name.TrimStart('_');
+
+    static string GetPropNamePascal(string name)
+    {
+        var trimmed = name.TrimStart('_');
+        return char.ToUpper(trimmed[0]) + trimmed.Substring(1);
+    }
+
+    static SerializedProperty FindProperty(SerializedObject so, string name)
+      => so.FindProperty(name) ??
+         so.FindProperty(GetPropNameCamel(name)) ??
+         so.FindProperty(GetPropNamePascal(name)) ??
+         so.FindProperty(GetPropNameBacking(name)) ??
+         so.FindProperty(GetPropNameBacking(GetPropNameCamel(name))) ??
+         so.FindProperty(GetPropNameBacking(GetPropNamePascal(name)));
+}
+
+} // namespace KlutterTools.InspectorUtils

package/Editor/InspectorUtils.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a4362ea3b9f0e468d810ba355e03c682

package/Editor/KlutterTools.Editor.asmdef

@@ -16,6 +16,11 @@
             "name": "com.unity.render-pipelines.high-definition",
             "expression": "1.0.0",
             "define": "KLUTTER_TOOLS_HAS_HDRP"
+        },
+        {
+            "name": "com.unity.visualeffectgraph",
+            "expression": "1.0.0",
+            "define": "KLUTTER_TOOLS_HAS_VFXGRAPH"
         }
     ],
     "noEngineReferences": false

package/Editor/PlayerLoopHelper.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine.LowLevel;
 
-namespace Klak.KlutterTools {
+namespace KlutterTools {
 
 public static class PlayerLoopHelper
 {
@@ -31,4 +31,4 @@ public static class PlayerLoopHelper
     }
 }
 
-} // namespace Klak.KlutterTools 
+} // namespace KlutterTools

package/Editor/PreferencesProvider.cs

@@ -1,7 +1,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Klak.KlutterTools {
+namespace KlutterTools {
 
 // Preference accessor
 public static class Preferences
@@ -22,13 +22,13 @@ public static class Preferences
     static class Keys
     {
         public const string FpsCapperEnable
-          = "Klak.KlutterTools.FpsCapper.Enable";
+          = "KlutterTools.FpsCapper.Enable";
 
         public const string FpsCapperFrameRate
-          = "Klak.KlutterTools.FpsCapper.FrameRate";
+          = "KlutterTools.FpsCapper.FrameRate";
 
         public const string VfxGraphZoomStep
-          = "Klak.KlutterTools.VfxGraph.ZoomStep";
+          = "KlutterTools.VfxGraph.ZoomStep";
     }
 }
 
@@ -80,4 +80,4 @@ public sealed class PreferencesProvider : SettingsProvider
       => new PreferencesProvider();
 }
 
-} // namespace Klak.KlutterTools 
+} // namespace KlutterTools

package/Editor/VfxGraphZoomStepModifier.cs

@@ -2,7 +2,9 @@ using System;
 using System.Reflection;
 using UnityEditor;
 
-namespace Klak.KlutterTools {
+namespace KlutterTools {
+
+#if KLUTTER_TOOLS_HAS_VFXGRAPH
 
 [InitializeOnLoad]
 public static class VfxGraphZoomStepModifier
@@ -40,4 +42,6 @@ public static class VfxGraphZoomStepModifier
     }
 }
 
-} // namespace Klak.KlutterTools 
+#endif
+
+} // namespace KlutterTools

package/package.json

@@ -5,7 +5,7 @@
   "author": "Keijiro Takahashi",
   "license": "Unlicense",
   "dependencies": { },
-  "version": "1.0.0",
+  "version": "2.0.0",
   "unity": "6000.0",
   "keywords": [ "unity" ]
 }