Merge pull request #79 from JasonMa0012/dev

Add Preset support to SubPowerSlider

Author: JasonMa0012

.obsidian/core-plugins.json

@@ -27,5 +27,7 @@
   "file-recovery": true,
   "publish": false,
   "sync": false,
-  "webviewer": false
+  "webviewer": false,
+  "footnotes": false,
+  "bases": true
 }

.obsidian/plugins/copy-url-in-preview/main.js

@@ -1,11 +1,11 @@
 {
   "id": "copy-url-in-preview",
   "name": "Image Context Menus",
-  "version": "1.10.0",
+  "version": "1.11.2",
   "minAppVersion": "1.6.6",
-  "description": "Copy to clipboard, Open in default app, Show in system explorer, Reveal file in navigation, Open in new tab context menus for images.",
+  "description": "Copy to clipboard, Open in default app, Show in system explorer, Reveal file in navigation, Open in new tab, Rename context menus for images.",
   "author": "NomarCub",
   "authorUrl": "https://github.com/NomarCub",
   "fundingUrl": "https://ko-fi.com/nomarcub",
   "isDesktopOnly": false
-}
+}

.obsidian/plugins/copy-url-in-preview/manifest.json

@@ -6,5 +6,5 @@
     "description": "Integrate Git version control with automatic backup and other advanced features.",
     "isDesktopOnly": false,
     "fundingUrl": "https://ko-fi.com/vinzent",
-    "version": "2.33.0"
+    "version": "2.35.2"
 }

.obsidian/plugins/obsidian-git/manifest.json

@@ -4,11 +4,11 @@
     "type": "split",
     "children": [
       {
-        "id": "39735eaedba9e390",
+        "id": "b0664b3e516452e0",
         "type": "tabs",
         "children": [
           {
-            "id": "1ab61776fdab9c7c",
+            "id": "d93ffc2d4e7b14bd",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -20,15 +20,9 @@
               "icon": "lucide-file",
               "title": "README_CN"
             }
-          }
-        ]
-      },
-      {
-        "id": "b0664b3e516452e0",
-        "type": "tabs",
-        "children": [
+          },
           {
-            "id": "d93ffc2d4e7b14bd",
+            "id": "9762a61535bfd3ff",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -41,7 +35,9 @@
               "title": "README"
             }
           }
-        ]
+        ],
+        "currentTab": 1,
+        "stacked": true
       }
     ],
     "direction": "vertical"
@@ -185,8 +181,8 @@
             "state": {
               "type": "git-view",
               "state": {},
-              "icon": "git-pull-request",
-              "title": "Source Control"
+              "icon": "lucide-ghost",
+              "title": "git-view"
             }
           }
         ],
@@ -199,6 +195,7 @@
   },
   "left-ribbon": {
     "hiddenItems": {
+      "bases:Create new base": false,
       "switcher:Open quick switcher": false,
       "graph:Open graph view": false,
       "canvas:Create new canvas": false,
@@ -208,11 +205,11 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "d93ffc2d4e7b14bd",
+  "active": "9762a61535bfd3ff",
   "lastOpenFiles": [
-    "Editor/ShaderDrawer.cs~",
     "README_CN.md",
     "README.md",
+    "Editor/ShaderDrawer.cs~",
     "package.json~",
     "Editor/ScriptableObject.meta",
     "Editor/ScriptableObject/LwguiShaderPropertyPreset.cs.meta",
@@ -222,7 +219,6 @@
     "Editor/ScriptableObject/LwguiRampAtlas.cs",
     "Editor/ScriptableObject/GradientObject.cs",
     "Editor/ScriptableObject",
-    "Editor/ScriptableObject/LWGUIShaderPropertyPreset.cs",
     "assets~/Pasted image 20250523120309.png",
     "assets~/Pasted image 20250522183200.png",
     "assets~/Pasted image 20250321174432.png",

.obsidian/workspace.json

@@ -283,18 +283,25 @@ public Preset GetPreset(int index)
 			if (presets == null)
 				return null;
 
-			if (index < presets.Count)
-			{
+			if (index < presets.Count && index >= 0)
 				return presets[index];
-			}
-			else
-			{
-				Debug.LogError($"LWGUI: Index ({ index }) is out of range when accessing PresetFile: { name }");
-				return null;
-			}
+			
+			Debug.LogError($"LWGUI: Index ({ index }) is out of range when accessing PresetFile: { name }");
+			return null;
 		}
 
-		public Preset GetPreset(float index) => GetPreset((int)index);
+		public Preset TryGetPreset(int index)
+		{
+			if (presets == null)
+				return null;
+
+			if (index < presets.Count && index >= 0)
+				return presets[index];
+
+			return null;
+		}
+		
+		public Preset TryGetPreset(float floatIndex) => TryGetPreset(Mathf.CeilToInt(floatIndex));
 
 		private void OnValidate()
 		{

Editor/ScriptableObject/LwguiShaderPropertyPreset.cs

@@ -30,7 +30,8 @@ public interface IPresetDrawer
 	{
 		public string GetPresetFileName();
 
-		public LwguiShaderPropertyPreset.Preset GetActivePreset(MaterialProperty inProp, LwguiShaderPropertyPreset lwguiShaderPropertyPreset);
+		public LwguiShaderPropertyPreset.Preset GetActivePreset(MaterialProperty inProp, LwguiShaderPropertyPreset lwguiShaderPropertyPreset) =>
+			lwguiShaderPropertyPreset?.TryGetPreset(inProp?.floatValue ?? -1);
 	}
 	#endregion
 
@@ -110,9 +111,6 @@ public virtual void GetDefaultValueDescription(Shader inShader, MaterialProperty
 
 		public string GetPresetFileName() => _presetFileName;
 
-		public LwguiShaderPropertyPreset.Preset GetActivePreset(MaterialProperty inProp, LwguiShaderPropertyPreset lwguiShaderPropertyPreset) =>
-			PresetDrawer.GetActivePresetFromFloatProperty(inProp, lwguiShaderPropertyPreset);
-
 		public override void OnGUI(Rect position, MaterialProperty prop, GUIContent label, MaterialEditor editor)
 		{
 			metaDatas = Helper.GetLWGUIMetadatas(editor);
@@ -128,7 +126,7 @@ public override void OnGUI(Rect position, MaterialProperty prop, GUIContent labe
 				prop.floatValue = toggleResult ? 1.0f : 0.0f;
 				var keyword = Helper.GetKeywordName(_keyword, prop.name);
 				Helper.SetShaderKeywordEnabled(editor.targets, keyword, toggleResult);
-				PresetHelper.GetPresetAsset(_presetFileName)?.GetPreset(prop.floatValue)?.ApplyToEditingMaterial(editor, metaDatas.perMaterialData);
+				PresetHelper.GetPresetAsset(_presetFileName)?.TryGetPreset(prop.floatValue)?.ApplyToEditingMaterial(editor, metaDatas.perMaterialData);
 				TimelineHelper.SetKeywordToggleToTimeline(prop, editor, keyword);
 			}
 			EditorGUI.showMixedValue = showMixedValue;
@@ -265,9 +263,6 @@ public override void GetDefaultValueDescription(Shader inShader, MaterialPropert
 		}
 
 		public string GetPresetFileName() => _presetFileName;
-		
-		public LwguiShaderPropertyPreset.Preset GetActivePreset(MaterialProperty inProp, LwguiShaderPropertyPreset lwguiShaderPropertyPreset) =>
-			PresetDrawer.GetActivePresetFromFloatProperty(inProp, lwguiShaderPropertyPreset);
 
 		public override void DrawProp(Rect position, MaterialProperty prop, GUIContent label, MaterialEditor editor)
 		{
@@ -279,7 +274,7 @@ public override void DrawProp(Rect position, MaterialProperty prop, GUIContent l
 				prop.floatValue = value ? 1.0f : 0.0f;
 				var keyword = Helper.GetKeywordName(_keyWord, prop.name);
 				Helper.SetShaderKeywordEnabled(editor.targets, keyword, value);
-				PresetHelper.GetPresetAsset(_presetFileName)?.GetPreset(prop.floatValue)?.ApplyToEditingMaterial(editor, metaDatas.perMaterialData);
+				PresetHelper.GetPresetAsset(_presetFileName)?.TryGetPreset(prop.floatValue)?.ApplyToEditingMaterial(editor, metaDatas.perMaterialData);
 				TimelineHelper.SetKeywordToggleToTimeline(prop, editor, keyword);
 			}
 			EditorGUI.showMixedValue = false;
@@ -301,30 +296,61 @@ public override void Apply(MaterialProperty prop)
 	/// 
 	/// group: parent group name (Default: none)
 	/// power: power of slider (Default: 1)
+	///	presetFileName: "Shader Property Preset" asset name, it rounds up the float to choose which Preset to use.
+	///		You can create new Preset by
+	///		"Right Click > Create > LWGUI > Shader Property Preset" in Project window,
+	///		*any Preset in the entire project cannot have the same name*
 	/// Target Property Type: Range
 	/// </summary>
-	public class SubPowerSliderDrawer : SubDrawer
+	public class SubPowerSliderDrawer : SubDrawer, IPresetDrawer
 	{
+		public string presetFileName;
+		
 		private float _power = 1;
 
 		public SubPowerSliderDrawer(float power) : this("_", power) { }
+		
+		public SubPowerSliderDrawer(string group, float power) : this(group, power, string.Empty) { }
 
-		public SubPowerSliderDrawer(string group, float power)
+		public SubPowerSliderDrawer(string group, float power, string presetFileName)
 		{
 			this.group = group;
 			this._power = Mathf.Clamp(power, 0, float.MaxValue);
+			this.presetFileName = presetFileName;
 		}
 
 		protected override bool IsMatchPropType(MaterialProperty property) { return property.GetPropertyType() == ShaderPropertyType.Range; }
+		
+		public override void BuildStaticMetaData(Shader inShader, MaterialProperty inProp, MaterialProperty[] inProps, PropertyStaticData inoutPropertyStaticData)
+		{
+			base.BuildStaticMetaData(inShader, inProp, inProps, inoutPropertyStaticData);
+			PresetDrawer.SetPresetAssetToStaticData(inoutPropertyStaticData, presetFileName);
+		}
+
+		public string GetPresetFileName() => presetFileName;
 
 		public override void DrawProp(Rect position, MaterialProperty prop, GUIContent label, MaterialEditor editor)
 		{
 			RevertableHelper.FixGUIWidthMismatch(prop.GetPropertyType(), editor);
 			EditorGUI.showMixedValue = prop.hasMixedValue;
 			var rect = position;
+			var oldValue = prop.floatValue;
 			ReflectionHelper.DoPowerRangeProperty(rect, prop, label, _power);
+			if (prop.floatValue != oldValue)
+			{
+				PresetHelper.GetPresetAsset(presetFileName)?.TryGetPreset(prop.floatValue)?.ApplyToEditingMaterial(editor, metaDatas.perMaterialData);
+			}
 			EditorGUI.showMixedValue = false;
 		}
+
+		public override void Apply(MaterialProperty prop)
+		{
+			base.Apply(prop);
+			if (!prop.hasMixedValue && VersionControlHelper.IsWriteable(prop.targets))
+			{
+				PresetDrawer.ApplyPresetWithoutPropertyChanges(presetFileName, prop);
+			}
+		}
 	}
 
 	/// <summary>
@@ -717,28 +743,14 @@ public static void SetPresetAssetToStaticData(PropertyStaticData inoutPropertySt
 			inoutPropertyStaticData.propertyPresetAsset = PresetHelper.GetPresetAsset(presetFileName);
 		}
 
-		public static LwguiShaderPropertyPreset.Preset GetActivePresetFromFloatProperty(MaterialProperty inProp, LwguiShaderPropertyPreset lwguiShaderPropertyPreset)
-		{
-			LwguiShaderPropertyPreset.Preset preset = null;
-			var index = (int)inProp.floatValue;
-			if (lwguiShaderPropertyPreset && index >= 0 && index < lwguiShaderPropertyPreset.GetPresetCount())
-			{
-				preset = lwguiShaderPropertyPreset.GetPreset(index);
-			}
-			return preset;
-		}
-
 		// Apply Keywords and Passes in presets without modifying other property values
 		// Used to call in MaterialPropertyDrawer.Apply()
 		public static void ApplyPresetWithoutPropertyChanges(string presetFileName, MaterialProperty prop)
 		{
 			var presetFile = PresetHelper.GetPresetAsset(presetFileName);
-			if (presetFile != null
-			    && prop.floatValue < presetFile.GetPresetCount()
-			    && ShowIfDecorator.GetShowIfResultToFilterDrawerApplying(prop)
-			   )
+			if (presetFile && ShowIfDecorator.GetShowIfResultToFilterDrawerApplying(prop))
 			{
-				presetFile.GetPreset(prop.floatValue)?.ApplyKeywordsAndPassesToMaterials(prop.targets);
+				presetFile.TryGetPreset(prop.floatValue)?.ApplyKeywordsAndPassesToMaterials(prop.targets);
 			}
 		}
 
@@ -752,18 +764,13 @@ public override void BuildStaticMetaData(Shader inShader, MaterialProperty inPro
 
 		public override void GetDefaultValueDescription(Shader inShader, MaterialProperty inProp, MaterialProperty inDefaultProp, PerShaderData inPerShaderData, PerMaterialData inoutPerMaterialData)
 		{
-			var index = (int)inDefaultProp.floatValue;
 			var propertyPreset = inPerShaderData.propStaticDatas[inProp.name].propertyPresetAsset;
-
-			if (propertyPreset && index < propertyPreset.GetPresetCount() && index >= 0)
-				inoutPerMaterialData.propDynamicDatas[inProp.name].defaultValueDescription = propertyPreset.GetPreset(index).presetName;
+			if (propertyPreset)
+				inoutPerMaterialData.propDynamicDatas[inProp.name].defaultValueDescription = propertyPreset.TryGetPreset(inDefaultProp.floatValue)?.presetName;
 		}
 
 		public string GetPresetFileName() => presetFileName;
 
-		public LwguiShaderPropertyPreset.Preset GetActivePreset(MaterialProperty inProp, LwguiShaderPropertyPreset lwguiShaderPropertyPreset) =>
-			GetActivePresetFromFloatProperty(inProp, lwguiShaderPropertyPreset);
-
 		public override void DrawProp(Rect position, MaterialProperty prop, GUIContent label, MaterialEditor editor)
 		{
 			EditorGUI.BeginChangeCheck();
@@ -773,7 +780,7 @@ public override void DrawProp(Rect position, MaterialProperty prop, GUIContent l
 
 			int index = (int)Mathf.Max(0, prop.floatValue);
 			var presetFile = PresetHelper.GetPresetAsset(presetFileName);
-			if (presetFile == null || presetFile.GetPresetCount() == 0)
+			if (!presetFile || presetFile.GetPresetCount() == 0)
 			{
 				Helper.DrawShaderPropertyWithErrorLabel(rect, prop, label, editor, $"Invalid Preset File: {presetFileName}");
 				return;
@@ -790,7 +797,7 @@ public override void DrawProp(Rect position, MaterialProperty prop, GUIContent l
 				if (Helper.EndChangeCheck(metaDatas, prop))
 				{
 					prop.floatValue = newIndex;
-					presetFile.GetPreset(newIndex).ApplyToEditingMaterial(editor, metaDatas.perMaterialData);
+					presetFile.TryGetPreset(newIndex)?.ApplyToEditingMaterial(editor, metaDatas.perMaterialData);
 				}
 				EditorGUI.showMixedValue = false;
 			}
@@ -799,7 +806,6 @@ public override void DrawProp(Rect position, MaterialProperty prop, GUIContent l
 				Helper.DrawShaderPropertyWithErrorLabel(position, prop, label, editor, $"Out of Index Range");
 				Debug.LogError($"LWGUI: { prop.name } out of Preset index range!");
 			}
-
 		}
 
 		public override void Apply(MaterialProperty prop)

Editor/ShaderDrawer.cs

@@ -217,6 +217,10 @@ public SubToggleDrawer(string group, string keyWord, string presetFileName)
 /// 
 /// group: parent group name (Default: none)
 /// power: power of slider (Default: 1)
+/// presetFileName: "Shader Property Preset" asset name, it rounds up the float to choose which Preset to use.  
+///    You can create new Preset by  
+///    "Right Click > Create > LWGUI > Shader Property Preset" in Project window,  
+///    *any Preset in the entire project cannot have the same name*
 /// Target Property Type: Range
 public SubPowerSliderDrawer(float power) : this("_", power) { }
 public SubPowerSliderDrawer(string group, float power)

README.md

@@ -214,6 +214,10 @@ public SubToggleDrawer(string group, string keyWord, string presetFileName)
 /// 
 /// group: parent group name (Default: none)
 /// power: power of slider (Default: 1)
+/// presetFileName: "Shader Property Preset" asset name, it rounds up the float to choose which Preset to use.  
+///    You can create new Preset by  
+///    "Right Click > Create > LWGUI > Shader Property Preset" in Project window,  
+///    *any Preset in the entire project cannot have the same name*
 /// Target Property Type: Range
 public SubPowerSliderDrawer(float power) : this("_", power) { }
 public SubPowerSliderDrawer(string group, float power)

README_CN.md

@@ -13,7 +13,7 @@ Material:
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _KEYWORDENUM_KEY2
-  - _KWENUM_KEY2
+  - _KWENUM_KEY1
   - _SUBKEYWORDENUM_KEY1
   m_InvalidKeywords: []
   m_LightmapFlags: 4
@@ -33,7 +33,7 @@ Material:
     - _group: 1
     - _group_toggle1: 0
     - _keywordEnum: 1
-    - _kwenum: 1
+    - _kwenum: 0
     - _preset2: 0
     - _subEnum: 1
     - _subKeywordEnum: 0