Refactor: Light inspector is now auto-generated

Source/EditorManaged/Inspectors/LightInspector.cs

@@ -15,169 +15,24 @@ namespace bs.Editor
     [CustomInspector(typeof(Light))]
     internal class LightInspector : Inspector
     {
-        private GUIEnumField lightTypeField = new GUIEnumField(typeof(LightType), new LocEdString("Light type"));
-        private GUIColorField colorField = new GUIColorField(new LocEdString("Color"));
-        private GUIFloatField attRadiusField = new GUIFloatField(new LocEdString("Attenuation radius"));
-        private GUIFloatField sourceRadiusField = new GUIFloatField(new LocEdString("Source radius"));
-        private GUIFloatField intensityField = new GUIFloatField(new LocEdString("Intensity"));
-        private GUISliderField spotAngleField = new GUISliderField(1, 180, new LocEdString("Spot angle"));
-        private GUISliderField spotFalloffAngleField = new GUISliderField(1, 180, new LocEdString("Spot falloff angle"));
-        private GUIToggleField autoAttenuationField = new GUIToggleField(new LocEdString("Use auto. attenuation"));
-        private GUIToggleField castShadowField = new GUIToggleField(new LocEdString("Cast shadow"));
-        private GUISliderField shadowBiasField = new GUISliderField(-1.0f, 1.0f, new LocEdString("Shadow bias"));
-
-        private InspectableState modifyState;
-
         /// <inheritdoc/>
         protected internal override void Initialize()
         {
-            if (InspectedObject != null)
-            {
-                Light light = (Light)InspectedObject;
-
-                lightTypeField.OnSelectionChanged += x =>
-                {
-                    light.Type = (LightType)x;
-
-                    ToggleTypeSpecificFields((LightType) x, light.UseAutoAttenuation, light.CastsShadow);
-                };
-
-                colorField.OnChanged += x =>
-                {
-                    light.Color = x;
-                    MarkAsModified();
-                    ConfirmModify();
-                };
-
-                attRadiusField.OnChanged += x => { light.AttenuationRadius = x; MarkAsModified(); };
-                attRadiusField.OnConfirmed += ConfirmModify;
-                attRadiusField.OnFocusLost += ConfirmModify;
-
-                sourceRadiusField.OnChanged += x => { light.SourceRadius = x; MarkAsModified(); };
-                sourceRadiusField.OnConfirmed += ConfirmModify;
-                sourceRadiusField.OnFocusLost += ConfirmModify;
-
-                intensityField.OnChanged += x => { light.Intensity = x; MarkAsModified(); };
-                intensityField.OnConfirmed += ConfirmModify;
-                intensityField.OnFocusLost += ConfirmModify;
+            Light light = (Light)InspectedObject;
 
-                spotAngleField.OnChanged += x => { light.SpotAngle = (Degree)x; MarkAsModified(); };
-                spotAngleField.OnFocusLost += ConfirmModify;
+            drawer.AddDefault(light);
 
-                spotFalloffAngleField.OnChanged += x => { light.SpotAngleFalloff = (Degree)x; MarkAsModified(); };
-                spotFalloffAngleField.OnFocusLost += ConfirmModify;
-
-                castShadowField.OnChanged += x =>
-                {
-                    light.CastsShadow = x;
-                    ToggleTypeSpecificFields(light.Type, light.UseAutoAttenuation, x);
-                    MarkAsModified();
-                    ConfirmModify();
-                };
-
-                autoAttenuationField.OnChanged += x =>
-                {
-                    light.UseAutoAttenuation = x;
-                    ToggleTypeSpecificFields(light.Type, x, light.CastsShadow);
-                    MarkAsModified();
-                    ConfirmModify();
-                };
-
-                shadowBiasField.OnChanged += x => { light.ShadowBias = x; MarkAsModified(); };
-                shadowBiasField.OnFocusLost += ConfirmModify;
-
-                Layout.AddElement(lightTypeField);
-                Layout.AddElement(colorField);
-                Layout.AddElement(intensityField);
-                Layout.AddElement(attRadiusField);
-                Layout.AddElement(sourceRadiusField);
-                Layout.AddElement(spotAngleField);
-                Layout.AddElement(spotFalloffAngleField);
-                Layout.AddElement(autoAttenuationField);
-                Layout.AddElement(castShadowField);
-                Layout.AddElement(shadowBiasField);
-
-                ToggleTypeSpecificFields(light.Type, light.UseAutoAttenuation, light.CastsShadow);
-            }
-        }
-
-        /// <inheritdoc/>
-        protected internal override InspectableState Refresh(bool force = false)
-        {
-            Light light = InspectedObject as Light;
-            if (light == null)
-                return InspectableState.NotModified;
-
-            LightType lightType = light.Type;
-            if (lightTypeField.Value != (ulong)lightType || autoAttenuationField.Value != light.UseAutoAttenuation)
-                ToggleTypeSpecificFields(lightType, light.UseAutoAttenuation, light.CastsShadow);
-
-            lightTypeField.Value = (ulong)lightType;
-            colorField.Value = light.Color;
-            intensityField.Value = light.Intensity;
-            attRadiusField.Value = light.AttenuationRadius;
-            sourceRadiusField.Value = light.SourceRadius;
-            spotAngleField.Value = light.SpotAngle.Degrees;
-            spotFalloffAngleField.Value = light.SpotAngleFalloff.Degrees;
-            autoAttenuationField.Value = light.UseAutoAttenuation;
-            castShadowField.Value = light.CastsShadow;
-            shadowBiasField.Value = light.ShadowBias;
-
-            InspectableState oldState = modifyState;
-            if (modifyState.HasFlag(InspectableState.Modified))
-                modifyState = InspectableState.NotModified;
-
-            return oldState;
-        }
-
-        /// <summary>
-        /// Enables or disables different GUI elements depending on the light type.
-        /// </summary>
-        /// <param name="type">Light type to show GUI elements for.</param>
-        /// <param name="physBasedAttenuation">Determines is physically based attenuation enabled.</param>
-        /// <param name="castsShadows">Determines if shadow specific options should be shown.</param>
-        private void ToggleTypeSpecificFields(LightType type, bool physBasedAttenuation, bool castsShadows)
-        {
-            if (type == LightType.Directional)
+            drawer.AddConditional("SpotAngle", () => light.Type == LightType.Spot);
+            drawer.AddConditional("SpotAngleFalloff", () => light.Type == LightType.Spot);
+            drawer.AddConditional("AutoAttenuation", () => light.Type != LightType.Directional);
+            drawer.AddConditional("AttenuationRadius", () =>
             {
-                attRadiusField.Active = false;
-                spotAngleField.Active = false;
-                spotFalloffAngleField.Active = false;
-                autoAttenuationField.Active = false;
-            }
-            else if (type == LightType.Radial)
-            {
-                attRadiusField.Active = !physBasedAttenuation;
-                spotAngleField.Active = false;
-                spotFalloffAngleField.Active = false;
-                autoAttenuationField.Active = true;
-            }
-            else
-            {
-                attRadiusField.Active = !physBasedAttenuation;
-                spotAngleField.Active = true;
-                spotFalloffAngleField.Active = true;
-                autoAttenuationField.Active = true;
-            }
-
-            shadowBiasField.Active = castsShadows;
-        }
+                if (light.Type == LightType.Directional)
+                    return false;
 
-        /// <summary>
-        /// Marks the contents of the inspector as modified.
-        /// </summary>
-        protected void MarkAsModified()
-        {
-            modifyState |= InspectableState.ModifyInProgress;
-        }
-
-        /// <summary>
-        /// Confirms any queued modifications.
-        /// </summary>
-        protected void ConfirmModify()
-        {
-            if (modifyState.HasFlag(InspectableState.ModifyInProgress))
-                modifyState |= InspectableState.Modified;
+                return !light.UseAutoAttenuation;
+            });
+            drawer.AddConditional("ShadowBias", () => light.CastsShadow);
         }
     }
 

Source/bsf

@@ -1 +1 @@
-Subproject commit 0badff48f88f501d8de865b438aeb3d494337e79
+Subproject commit c96c138f3bcf7eb58d9c9c0cd91cb54d3789e851