FIX: Visualizers are now created even when no current device exist. This was previously incorrectly skipped, but only value control visualizer needs a device to show anything useful.

Author: ekcoh

Assets/Samples/Visualizers/InputControlVisualizer.cs

@@ -163,30 +163,29 @@ private void ResolveControl()
             SetupVisualizer();
         }
 
-        private void SetupVisualizer()
+        private static VisualizationHelpers.Visualizer CreateVisualizer(Mode mode, InputControl control, int historySamples)
         {
-            if (m_Control == null)
-            {
-                m_Visualizer = null;
-                return;
-            }
-
-            switch (m_Visualization)
+            switch (mode)
             {
                 case Mode.Value:
                 {
-                    var valueType = m_Control.valueType;
+                    // This visualization mode requires a control
+                    if (control == null)
+                        return null;
+                    
+                    VisualizationHelpers.Visualizer visualizer = null;
+                    var valueType = control.valueType;
                     if (valueType == typeof(Vector2))
-                        m_Visualizer = new VisualizationHelpers.Vector2Visualizer(m_HistorySamples);
+                        visualizer = new VisualizationHelpers.Vector2Visualizer(historySamples);
                     else if (valueType == typeof(float))
-                        m_Visualizer = new VisualizationHelpers.ScalarVisualizer<float>(m_HistorySamples)
+                        visualizer = new VisualizationHelpers.ScalarVisualizer<float>(historySamples)
                         {
                             ////TODO: pass actual min/max limits of control
                             limitMax = 1,
                             limitMin = 0
                         };
                     else if (valueType == typeof(int))
-                        m_Visualizer = new VisualizationHelpers.ScalarVisualizer<int>(m_HistorySamples)
+                        visualizer = new VisualizationHelpers.ScalarVisualizer<int>(historySamples)
                         {
                             ////TODO: pass actual min/max limits of control
                             limitMax = 1,
@@ -196,66 +195,65 @@ private void SetupVisualizer()
                     {
                         ////TODO: generic visualizer
                     }
-                    break;
+                    return visualizer;
                 }
 
                 case Mode.Events:
                 {
-                    var visualizer = new VisualizationHelpers.TimelineVisualizer(m_HistorySamples)
+                    var visualizer = new VisualizationHelpers.TimelineVisualizer(historySamples)
                     {
                         timeUnit = VisualizationHelpers.TimelineVisualizer.TimeUnit.Frames,
-                        historyDepth = m_HistorySamples,
+                        historyDepth = historySamples,
                         showLimits = true,
                         limitsY = new Vector2(0, 5) // Will expand upward automatically
                     };
-                    m_Visualizer = visualizer;
                     visualizer.AddTimeline("Events", Color.green,
                         VisualizationHelpers.TimelineVisualizer.PlotType.BarChart);
-                    break;
+                    return visualizer;
                 }
 
                 case Mode.MaximumLag:
                 {
-                    var visualizer = new VisualizationHelpers.TimelineVisualizer(m_HistorySamples)
+                    var visualizer = new VisualizationHelpers.TimelineVisualizer(historySamples)
                     {
                         timeUnit = VisualizationHelpers.TimelineVisualizer.TimeUnit.Frames,
-                        historyDepth = m_HistorySamples,
+                        historyDepth = historySamples,
                         valueUnit = new GUIContent("ms"),
                         showLimits = true,
                         limitsY = new Vector2(0, 6)
                     };
-                    m_Visualizer = visualizer;
                     visualizer.AddTimeline("MaxLag", Color.red,
                         VisualizationHelpers.TimelineVisualizer.PlotType.BarChart);
-                    break;
+                    return visualizer;
                 }
 
                 case Mode.Bytes:
                 {
-                    var visualizer = new VisualizationHelpers.TimelineVisualizer(m_HistorySamples)
+                    var visualizer = new VisualizationHelpers.TimelineVisualizer(historySamples)
                     {
                         timeUnit = VisualizationHelpers.TimelineVisualizer.TimeUnit.Frames,
                         valueUnit = new GUIContent("bytes"),
-                        historyDepth = m_HistorySamples,
+                        historyDepth = historySamples,
                         showLimits = true,
                         limitsY = new Vector2(0, 64)
                     };
-                    m_Visualizer = visualizer;
                     visualizer.AddTimeline("Bytes", Color.red,
                         VisualizationHelpers.TimelineVisualizer.PlotType.BarChart);
-                    break;
+                    return visualizer;
                 }
 
                 case Mode.DeviceCurrent:
-                {
-                    m_Visualizer = new VisualizationHelpers.CurrentDeviceVisualizer();
-                    break;
-                }
+                    return new VisualizationHelpers.CurrentDeviceVisualizer();
 
                 default:
-                    throw new NotImplementedException();
+                    throw new ArgumentOutOfRangeException(mode.ToString());
             }
         }
+        
+        private void SetupVisualizer()
+        {
+            m_Visualizer = CreateVisualizer(m_Visualization, m_Control, m_HistorySamples);
+        }
 
         private static void OnDeviceChange(InputDevice device, InputDeviceChange change)
         {