diff --git a/org.mixedrealitytoolkit.uxcore/CHANGELOG.md b/org.mixedrealitytoolkit.uxcore/CHANGELOG.md index f5b02e2d5..1a8f94704 100644 --- a/org.mixedrealitytoolkit.uxcore/CHANGELOG.md +++ b/org.mixedrealitytoolkit.uxcore/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). * Added `AlphaBlend` tint mode to `TintEffect`. [PR #1131](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1131) +### Changed + +* Replaced `#pragma warning disable CS0414` with `Name` properties across `StateVisualizer` effects. [PR #1143](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1143) + ### Fixed * Fixed "leaked managed shell" issue in `UGUIInputAdapter`. [PR #1096](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1096) diff --git a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/AnimationEffect.cs b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/AnimationEffect.cs index 7bd100004..939098bab 100644 --- a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/AnimationEffect.cs +++ b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/AnimationEffect.cs @@ -17,9 +17,12 @@ internal class AnimationEffect : PlayableEffect, IAnimationMixableEffect { [SerializeField] [HideInInspector] -#pragma warning disable CS0414 // Inspector uses this as a helpful label in lists. private string name = "Animation"; -#pragma warning restore CS0414 // Inspector uses this as a helpful label in lists. + + /// + /// The display name of this effect. + /// + internal string Name => name; [SerializeField] [Tooltip("The animation clip for this effect.")] diff --git a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/PlayableAssetEffect.cs b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/PlayableAssetEffect.cs index 7f3b356b5..1a272a156 100644 --- a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/PlayableAssetEffect.cs +++ b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/PlayableAssetEffect.cs @@ -17,9 +17,12 @@ internal class PlayableAssetEffect : PlayableEffect { [SerializeField] [HideInInspector] -#pragma warning disable CS0414 // Inspector uses this as a helpful label in lists. private string name = "Playable Asset"; -#pragma warning restore CS0414 // Inspector uses this as a helpful label in lists. + + /// + /// The display name of this effect. + /// + internal string Name => name; [SerializeField] [Tooltip("The scriptable object containing the effect.")] diff --git a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/SetTargetsActiveEffect.cs b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/SetTargetsActiveEffect.cs index c414acaf6..6a6c0d1ef 100644 --- a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/SetTargetsActiveEffect.cs +++ b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/SetTargetsActiveEffect.cs @@ -16,9 +16,12 @@ internal class SetTargetsActiveEffect : IEffect { [SerializeField] [HideInInspector] -#pragma warning disable CS0414 // Inspector uses this as a helpful label in lists. private string name = "Set Targets Active/Inactive"; -#pragma warning restore CS0414 // Inspector uses this as a helpful label in lists. + + /// + /// The display name of this effect. + /// + internal string Name => name; [SerializeField] [Tooltip("If true, the specified objects will be set inactive when the state is on, and vice versa.")] diff --git a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/SpriteSwapEffect.cs b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/SpriteSwapEffect.cs index d0b16d3b3..80b74c4b3 100644 --- a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/SpriteSwapEffect.cs +++ b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/SpriteSwapEffect.cs @@ -16,9 +16,12 @@ internal class SpriteSwapEffect : IEffect { [SerializeField] [HideInInspector] -#pragma warning disable CS0414 // Inspector uses this as a helpful label in lists. private string name = "Sprite Swap"; -#pragma warning restore CS0414 // Inspector uses this as a helpful label in lists. + + /// + /// The display name of this effect. + /// + internal string Name => name; [SerializeField] [Tooltip("Threshold value to activate this effect. When the state value is above this number, the effect will activate.")] diff --git a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TintEffect.cs b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TintEffect.cs index 511b3de07..635b62213 100644 --- a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TintEffect.cs +++ b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TintEffect.cs @@ -206,9 +206,12 @@ internal enum BlendType [SerializeField] [HideInInspector] -#pragma warning disable CS0414 // Inspector uses this as a helpful label in lists. private string name = "Tint"; -#pragma warning restore CS0414 // Inspector uses this as a helpful label in lists. + + /// + /// The display name of this effect. + /// + internal string Name => name; [SerializeField] [Tooltip("The duration of the transition from un-tinted to tinted.")] diff --git a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TwoWayAnimationEffect.cs b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TwoWayAnimationEffect.cs index 049767c17..ab0cc7eaa 100644 --- a/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TwoWayAnimationEffect.cs +++ b/org.mixedrealitytoolkit.uxcore/StateVisualizer/Effects/TwoWayAnimationEffect.cs @@ -19,9 +19,12 @@ internal class TwoWayAnimationEffect : PlayableEffect, IAnimationMixableEffect { [SerializeField] [HideInInspector] -#pragma warning disable CS0414 // Inspector uses this as a helpful label in lists. private string name = "Two Way Animation"; -#pragma warning restore CS0414 // Inspector uses this as a helpful label in lists. + + /// + /// The display name of this effect. + /// + internal string Name => name; [SerializeField] [Tooltip("The animation clip for the forward direction.")]