Adds ResolutionUpdate classes for listening and responding to changes

Author: omundy

Assets/_Project/Scenes/tally-viz.unity

@@ -37,21 +37,27 @@ void AddSymbols ()
         // add all the symbols - reference https://www.w3schools.com/charsets/ref_emoji.asp
         symbolDictionary = new Dictionary<string, string> (){
 
-            {"arrowRight", "\u2192"},
-            {"arrowRefresh", "\u21BB"},
+            {"asterism", "\u2042"}, // ⁂
+
+            {"arrowE", "\u2192"}, // →
+            {"arrowNE", "\u2197"}, // ↗
+            {"arrowRefresh", "\u21BB"}, // ↻
 
             {"circle", "\u25CF"},
             {"square", "\u25FC"},
             {"triangleUp", "\u25B2"},
             {"triangleRight", "\u25BA"},
 
+            {"cloud", "\u2601"}, // ☁
+            {"blackstar", "\u2605"}, // ★
 
-            {"sound", "\u266B"},
+            {"sound", "\u266B"}, // ♫
             {"heart", "\u2665"},
             {"diamond", "\u2666"},
 
-            {"phone", "\u260E"},
-            {"flag", "\u2691"},
+            {"phone", "\u260E"}, // ☎
+            {"flag", "\u2691"}, // ⚑
+            {"gear", "\u2699"}, // ⚙
             {"smilingFace", "\u263B"},
 
             {"star", "\u272D"},

Assets/_Project/Scripts/Core/DebugManager.cs

@@ -72,7 +72,7 @@ public static void StopListening (string eventName, UnityAction listener)
 
     public static void TriggerEvent (string eventName)
     {
-        Debug.Log (DebugManager.GetSymbol ("phone") + " EventManager.TriggerEvent() -> eventName = " + eventName);
+        Debug.Log (DebugManager.GetSymbol ("blackstar") + " EventManager.TriggerEvent() -> eventName = " + eventName);
 
         UnityEvent thisEvent = null;
         if (instance.eventDictionary.TryGetValue (eventName, out thisEvent)) {

Assets/_Project/Scripts/Core/EventManager.cs

@@ -6,25 +6,13 @@
 using TMPro;
 
 
-
-
-// Immersion Theater 6816 x 2240 / 3.04:1
-// Game Lab 4800 x 1080 / 4.44:1
-// Visualization Studio (estimated) 27053 x 2160 / 12.52:1
-
-
-
-
 /**
  *  Manage game "resolution" - runs in play mode AND editor
  */
 
-[ExecuteAlways]
-public class ResolutionManager : MonoBehaviour {
-
-
-
 
+//[ExecuteAlways]
+public class ResolutionManager : MonoBehaviour {
 
 
 
@@ -41,8 +29,7 @@ public class ResolutionManager : MonoBehaviour {
     [Tooltip ("Canvas resolution")]
     public Vector2 canvasResolution;
 
-    [Tooltip ("The grid of anchors")]
-    public Vector2 [] ninePointGrid;
+
 
 
 
@@ -105,20 +92,14 @@ public class ResolutionManager : MonoBehaviour {
 
     public TMP_Text resolutionReportText;
 
-    public GameObject [] resolutionMarkers;
 
 
 
 
-    public GameObject CeilingLight;
-    public GameObject BasementLight;
-    public GameObject CornerLightTopLeft;
+    //[SerializeField]
+    //private int framesSinceSizeUpdated = 0;
 
-
-    [SerializeField]
-    private int framesSinceSizeUpdated = 0;
-
-    bool updateWorld = true;
+    //bool updateWorld = true;
 
 
     private void Awake ()
@@ -134,16 +115,19 @@ private void Awake ()
 
     private void Update ()
     {
-        // if not playing 
-        if (!Application.IsPlaying (gameObject)) {
-            // if player resolution has changed
+        // if application is playing 
+        if (Application.IsPlaying (gameObject)) {
+            // and if player resolution has changed
             if (playerResolution.x != Screen.width || playerResolution.y != Screen.height) {
                 // update the parameters
                 UpdateResolutionParams ();
                 // update collider
                 UpdateColliderSize ();
-                // update object positions
-                UpdateGameObjectPositions ();
+
+
+                // trigger data updated event
+                EventManager.TriggerEvent ("ResolutionUpdated");
+
             }
         }
 
@@ -186,9 +170,6 @@ private void Update ()
         //if (updateWorld) {
         //    UpdateReport ();
         //    UpdateColliderSize ();
-        //    //UpdateBoundsDisplay ();
-        //    //DrawBounds (worldContainer.bounds);
-        //    //UpdateGameObjectPositions ();
 
 
         //    // reset counter
@@ -201,10 +182,23 @@ private void Update ()
     }
 
 
+    void UpdateColliderSize ()
+    {
+        // make sure there isn't a negative number
+        if (playerViewSize.x > 0 && playerViewSize.y > 0) {
+            worldContainerCollider.size = new Vector3 (playerViewSize.x, playerViewSize.y, worldContainerCollider.size.z);
+
 
+            // debugging
+            Debug.Log ("ResolutionManager.UpdateColliderSize() playerViewSize = " + playerViewSize.ToString ());
+            Debug.Log ("ResolutionManager.UpdateColliderSize() worldContainerCollider.size = " + worldContainerCollider.size.ToString ());
+            Debug.Log ("ResolutionManager.UpdateColliderSize() worldContainerCollider.bounds = " + worldContainerCollider.bounds.ToString ());
+        }
+
+    }
 
     /**
-     *  Update all the details on the resolution parameters
+     *  Update all the resolution parameters
      */
     public void UpdateResolutionParams ()
     {
@@ -226,6 +220,35 @@ public void UpdateResolutionParams ()
         deviceAspectRatio = deviceResolution.x / deviceResolution.y;
     }
 
+    /**
+     *  Return the player viewing volume size (in Unity units)
+     */
+    public static Vector3 GetPlayerViewSize ()
+    {
+        // The orthographicSize is half of the vertical viewing volume size
+        float height = Camera.main.orthographicSize * 2;
+        // The horizontal size of the viewing volume depends on the aspect ratio so...
+        // width = height * screen resolution aspect ratio
+        float width = height * Screen.width / Screen.height;
+        // return both
+        return new Vector2 (width, height);
+    }
+
+    /**
+     *  Return the editor Game View window size - works in editor
+     */
+    public static Vector2 GetMainGameViewSize ()
+    {
+        System.Type T = System.Type.GetType ("UnityEditor.GameView,UnityEditor");
+        System.Reflection.MethodInfo GetSizeOfMainGameView = T.GetMethod ("GetSizeOfMainGameView", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
+        System.Object Res = GetSizeOfMainGameView.Invoke (null, null);
+        return (Vector2)Res;
+    }
+
+
+    /**
+     *  Update the text in the UI
+     */
     void UpdateReport ()
     {
         // update text in control panel
@@ -241,141 +264,20 @@ void UpdateReport ()
     }
 
 
-    void UpdateColliderSize ()
-    {
-        // make sure there isn't a negative number
-        if (playerViewSize.x > 0 && playerViewSize.y > 0) {
-            worldContainerCollider.size = new Vector3 (playerViewSize.x, playerViewSize.y, worldContainerCollider.size.z);
-
-
-            // debugging
-            Debug.Log ("ResolutionManager.UpdateColliderSize() playerViewSize = " + playerViewSize.ToString ());
-            Debug.Log ("ResolutionManager.UpdateColliderSize() worldContainerCollider.size = " + worldContainerCollider.size.ToString ());
-            Debug.Log ("ResolutionManager.UpdateColliderSize() worldContainerCollider.bounds = " + worldContainerCollider.bounds.ToString ());
-        }
-
-    }
-
-
 
 
-    void UpdateGameObjectPositions ()
-    {
-        // display the nine point grid
-        ninePointGrid = GetPlanePointGrid (worldContainerCollider.bounds);
-        for (int i = 0; i < ninePointGrid.Length; i++) {
-            resolutionMarkers [i].transform.localPosition = new Vector3 (ninePointGrid [i].x, ninePointGrid [i].y, resolutionMarkers [0].transform.localPosition.z);
-        }
 
 
 
 
-        //Debug.Log (worldContainer.bounds.ToString ());
-    }
 
 
-    /**
-     *  Get 9 points on a plane
-     */
-    public Vector2 [] GetPlanePointGrid (Bounds b)
-    {
-        Vector2 [] p = new Vector2 [9];
-
-        p [0] = new Vector2 (b.min.x, b.max.y); // top left
-        p [1] = new Vector2 (b.center.x, b.max.y); // top center
-        p [2] = new Vector2 (b.max.x, b.max.y); // top right
-
-        p [3] = new Vector2 (b.min.x, b.center.y); // center left
-        p [4] = new Vector2 (b.center.x, b.center.y); // center center
-        p [5] = new Vector2 (b.max.x, b.center.y); // center right
-
-        p [6] = new Vector2 (b.min.x, b.min.y); // bottom left
-        p [7] = new Vector2 (b.center.x, b.min.y); // bottom center
-        p [8] = new Vector2 (b.max.x, b.min.y); // bottom right
-
-        return p;
-    }
 
 
 
 
 
 
-
-    void DrawBounds (Bounds b, float delay = 0)
-    {
-        // bottom
-        var p1 = new Vector3 (b.min.x, b.min.y, b.min.z);
-        var p2 = new Vector3 (b.max.x, b.min.y, b.min.z);
-        var p3 = new Vector3 (b.max.x, b.min.y, b.max.z);
-        var p4 = new Vector3 (b.min.x, b.min.y, b.max.z);
-
-        Debug.DrawLine (p1, p2, Color.blue, delay);
-        Debug.DrawLine (p2, p3, Color.red, delay);
-        Debug.DrawLine (p3, p4, Color.yellow, delay);
-        Debug.DrawLine (p4, p1, Color.magenta, delay);
-
-        // top
-        var p5 = new Vector3 (b.min.x, b.max.y, b.min.z);
-        var p6 = new Vector3 (b.max.x, b.max.y, b.min.z);
-        var p7 = new Vector3 (b.max.x, b.max.y, b.max.z);
-        var p8 = new Vector3 (b.min.x, b.max.y, b.max.z);
-
-        Debug.DrawLine (p5, p6, Color.blue, delay);
-        Debug.DrawLine (p6, p7, Color.red, delay);
-        Debug.DrawLine (p7, p8, Color.yellow, delay);
-        Debug.DrawLine (p8, p5, Color.magenta, delay);
-
-        // sides
-        Debug.DrawLine (p1, p5, Color.white, delay);
-        Debug.DrawLine (p2, p6, Color.gray, delay);
-        Debug.DrawLine (p3, p7, Color.green, delay);
-        Debug.DrawLine (p4, p8, Color.cyan, delay);
-    }
-
-
-    //public void UpdateBoundsDisplay ()
-    //{
-    //    Bounds bounds = worldContainer.bounds;
-    //    Debug.DrawLine (new Vector3 (bounds.min.x, bounds.min.y, bounds.min.z), new Vector3 (bounds.max.x, bounds.min.y, bounds.min.z), Color.red);
-    //    Debug.DrawLine (new Vector3 (bounds.max.x, bounds.min.y, bounds.min.z), new Vector3 (bounds.max.x, bounds.max.y, bounds.min.z), Color.red);
-    //    Debug.DrawLine (new Vector3 (bounds.max.x, bounds.max.y, bounds.min.z), new Vector3 (bounds.min.x, bounds.max.y, bounds.min.z), Color.red);
-    //    Debug.DrawLine (new Vector3 (bounds.min.x, bounds.max.y, bounds.min.z), new Vector3 (bounds.min.x, bounds.min.y, bounds.min.z), Color.red);
-    //    Debug.DrawLine (bounds.min, bounds.max, Color.red);
-    //}
-
-
-
-
-
-
-    /**
-     *  Return the player viewing volume size (in Unity units)
-     */
-    public static Vector3 GetPlayerViewSize ()
-    {
-        // The orthographicSize is half of the vertical viewing volume size
-        float height = Camera.main.orthographicSize * 2;
-        // The horizontal size of the viewing volume depends on the aspect ratio so...
-        // width = height * screen resolution aspect ratio
-        float width = height * Screen.width / Screen.height;
-        // return both
-        return new Vector2 (width, height);
-    }
-
-
-
-    // get size (in editor window only?)
-    public static Vector2 GetMainGameViewSize ()
-    {
-        System.Type T = System.Type.GetType ("UnityEditor.GameView,UnityEditor");
-        System.Reflection.MethodInfo GetSizeOfMainGameView = T.GetMethod ("GetSizeOfMainGameView", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
-        System.Object Res = GetSizeOfMainGameView.Invoke (null, null);
-        return (Vector2)Res;
-    }
-
-
-
 }
 
 

Assets/_Project/Scripts/Core/ResolutionManager.cs

@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+
+/**
+ *  Update components based on parameters from the ResolutionManager
+ *  - only used in runtime (editor scripts that modify prefabs are complex!)
+ */
+
+//[ExecuteAlways]
+public class ResolutionUpdateBase : MonoBehaviour {
+
+    protected ResolutionManager resolutionManager;
+
+    // listeners call method in inherited classes
+    void OnEnable ()
+    {
+        EventManager.StartListening ("ResolutionUpdated", UpdateResolution);
+    }
+    void OnDisable ()
+    {
+        EventManager.StopListening ("ResolutionUpdated", UpdateResolution);
+    }
+
+    protected virtual void Awake ()
+    {
+        // object references for child classes
+        resolutionManager = GameObject.Find ("ResolutionManager").GetComponent<ResolutionManager> ();
+
+    }
+
+    protected virtual void UpdateResolution ()
+    {
+        //Debug.Log ("ResolutionUpdaterBase");
+    }
+}