#135 propertyDisplay (#136)

HoloMoto · web-flow · commit 8900877e4e09 · 2023-01-05T09:45:22.000-08:00
diff --git a/com.microsoft.mrtk.graphicstools.unity/Editor/ShaderGUIs/StandardShaderGUI.cs b/com.microsoft.mrtk.graphicstools.unity/Editor/ShaderGUIs/StandardShaderGUI.cs
@@ -894,10 +894,31 @@ protected void FluentOptions(MaterialEditor materialEditor, Material material)
                     }
                 }
             }
+            
+            if (!PropertyEnabled(roundCorners) && PropertyEnabled(borderLight))
+            {
+                materialEditor.ShaderProperty(edgeSmoothingMode, Styles.edgeSmoothingMode, 2);
+
+                switch ((EdgeSmoothingMode)edgeSmoothingMode.floatValue)
+                {
+                    default:
+                    case EdgeSmoothingMode.Manual:
+                    {
+                        material.DisableKeyword(Styles.edgeSmoothingModeAutomaticName);
+                        materialEditor.ShaderProperty(edgeSmoothingValue, Styles.edgeSmoothingValue, 3);
+                    }
+                        break;
+                    case EdgeSmoothingMode.Automatic:
+                    {
+                        material.EnableKeyword(Styles.edgeSmoothingModeAutomaticName);
+                    }
+                        break;
+                }
+            }
 
             if (PropertyEnabled(hoverLight) || PropertyEnabled(proximityLight) || PropertyEnabled(borderLight))
             {
-                materialEditor.ShaderProperty(fluentLightIntensity, Styles.fluentLightIntensity);
+                materialEditor.ShaderProperty(fluentLightIntensity, Styles.fluentLightIntensity, 2);
             }
 
             materialEditor.ShaderProperty(roundCorners, Styles.roundCorners);
@@ -944,17 +965,17 @@ protected void FluentOptions(MaterialEditor materialEditor, Material material)
                 }
             }
 
-            if (PropertyEnabled(roundCorners) || PropertyEnabled(borderLight))
+            if (PropertyEnabled(roundCorners))
             {
-                materialEditor.ShaderProperty(edgeSmoothingMode, Styles.edgeSmoothingMode);
+                materialEditor.ShaderProperty(edgeSmoothingMode, Styles.edgeSmoothingMode, 2);
 
                 switch ((EdgeSmoothingMode)edgeSmoothingMode.floatValue)
                 {
                     default:
                     case EdgeSmoothingMode.Manual:
                         {
                             material.DisableKeyword(Styles.edgeSmoothingModeAutomaticName);
-                            materialEditor.ShaderProperty(edgeSmoothingValue, Styles.edgeSmoothingValue, 2);
+                            materialEditor.ShaderProperty(edgeSmoothingValue, Styles.edgeSmoothingValue, 3);
                         }
                         break;
                     case EdgeSmoothingMode.Automatic:

Original file line number	Diff line number	Diff line change
`@@ -894,10 +894,31 @@ protected void FluentOptions(MaterialEditor materialEditor, Material material)`
`894`	`894`	`}`
`895`	`895`	`}`
`896`	`896`	`}`
	`897`	`+`
	`898`	`+ if (!PropertyEnabled(roundCorners) && PropertyEnabled(borderLight))`
	`899`	`+ {`
	`900`	`+ materialEditor.ShaderProperty(edgeSmoothingMode, Styles.edgeSmoothingMode, 2);`
	`901`	`+`
	`902`	`+ switch ((EdgeSmoothingMode)edgeSmoothingMode.floatValue)`
	`903`	`+ {`
	`904`	`+ default:`
	`905`	`+ case EdgeSmoothingMode.Manual:`
	`906`	`+ {`
	`907`	`+ material.DisableKeyword(Styles.edgeSmoothingModeAutomaticName);`
	`908`	`+ materialEditor.ShaderProperty(edgeSmoothingValue, Styles.edgeSmoothingValue, 3);`
	`909`	`+ }`
	`910`	`+ break;`
	`911`	`+ case EdgeSmoothingMode.Automatic:`
	`912`	`+ {`
	`913`	`+ material.EnableKeyword(Styles.edgeSmoothingModeAutomaticName);`
	`914`	`+ }`
	`915`	`+ break;`
	`916`	`+ }`
	`917`	`+ }`
`897`	`918`
`898`	`919`	`if (PropertyEnabled(hoverLight) \|\| PropertyEnabled(proximityLight) \|\| PropertyEnabled(borderLight))`
`899`	`920`	`{`
`900`		`- materialEditor.ShaderProperty(fluentLightIntensity, Styles.fluentLightIntensity);`
	`921`	`+ materialEditor.ShaderProperty(fluentLightIntensity, Styles.fluentLightIntensity, 2);`
`901`	`922`	`}`
`902`	`923`
`903`	`924`	`materialEditor.ShaderProperty(roundCorners, Styles.roundCorners);`
`@@ -944,17 +965,17 @@ protected void FluentOptions(MaterialEditor materialEditor, Material material)`
`944`	`965`	`}`
`945`	`966`	`}`
`946`	`967`
`947`		`- if (PropertyEnabled(roundCorners) \|\| PropertyEnabled(borderLight))`
	`968`	`+ if (PropertyEnabled(roundCorners))`
`948`	`969`	`{`
`949`		`- materialEditor.ShaderProperty(edgeSmoothingMode, Styles.edgeSmoothingMode);`
	`970`	`+ materialEditor.ShaderProperty(edgeSmoothingMode, Styles.edgeSmoothingMode, 2);`
`950`	`971`
`951`	`972`	`switch ((EdgeSmoothingMode)edgeSmoothingMode.floatValue)`
`952`	`973`	`{`
`953`	`974`	`default:`
`954`	`975`	`case EdgeSmoothingMode.Manual:`
`955`	`976`	`{`
`956`	`977`	`material.DisableKeyword(Styles.edgeSmoothingModeAutomaticName);`
`957`		`- materialEditor.ShaderProperty(edgeSmoothingValue, Styles.edgeSmoothingValue, 2);`
	`978`	`+ materialEditor.ShaderProperty(edgeSmoothingValue, Styles.edgeSmoothingValue, 3);`
`958`	`979`	`}`
`959`	`980`	`break;`
`960`	`981`	`case EdgeSmoothingMode.Automatic:`