Adds Add/RemoveAllPlayers()

Author: omundy

Assets/_Project/Scenes/tally-viz.unity

@@ -173,7 +173,7 @@ private void Start ()
      */
     public void SetTimelineStatus (TimelineStatus _status, bool fromUI = false)
     {
-        Debug.Log ("Timeline.SetTimelineStatus() status = " + status + ", _status = " + _status);
+        //Debug.Log ("Timeline.SetTimelineStatus() status = " + status + ", _status = " + _status);
 
         // update status var
         status = _status;
@@ -186,18 +186,23 @@ public void SetTimelineStatus (TimelineStatus _status, bool fromUI = false)
     /**
      *  Called from the UI button to start / stop
      */
-    public void StartBtn ()
+    public void OnStartBtnClick ()
     {
         // if currently active
         if (status == TimelineStatus.active) {
-            SetStartBtn (" --- ", false);
+            SetStartBtnText (" --- ", false);
             // stop everything
             StopBufferLoop ();
             StopHistoryLoop ();
             // set status
             SetTimelineStatus (TimelineStatus.inactive);
             // update btn text and make interactable
-            SetStartBtn ("Start", true);
+            SetStartBtnText ("Start", true);
+            // if there are players active
+            if (PlayerManager.Instance.playerCount > 0) {
+                // then add them
+                EventManager.TriggerEvent ("RemoveAllPlayers");
+            }
         }
         // if not active
         else {
@@ -210,7 +215,7 @@ public void StartBtn ()
         UpdateTimelineLogs ();
     }
 
-    void SetStartBtn (string txt, bool interact)
+    void SetStartBtnText (string txt, bool interact)
     {
         startButtonText.text = txt;
         startButton.interactable = interact;
@@ -320,7 +325,7 @@ IEnumerator BufferLoop ()
                 waitingForDataProgress = 0;
 
                 // disable button until data arrives
-                SetStartBtn (" ... ", false);
+                SetStartBtnText (" ... ", false);
 
                 // set to waiting
                 SetTimelineStatus (TimelineStatus.waitingForData);
@@ -366,20 +371,22 @@ IEnumerator BufferLoop ()
                 // after new data, sort ascending
                 buffer.Sort ((x, y) => x.createdAt.CompareTo (y.createdAt));
 
-                // remove duplicate users here?
-
 
-                // if we have data in the buffer or history but no players then add them
+                // if we have data in the buffer or history but no players 
                 if (PlayerManager.Instance.playerCount < 1) {
-                    EventManager.TriggerEvent ("ResetPlayers");
+                    // then add them
+                    EventManager.TriggerEvent ("AddAllPlayers");
+                } else {
+                    // otherwise update them
+                    EventManager.TriggerEvent ("CheckUpdatePlayers");
                 }
 
 
                 // start history loop again
                 StartHistoryLoop ();
 
                 // update btn text and make interactable
-                SetStartBtn ("Stop", true);
+                SetStartBtnText ("Stop", true);
 
                 // set status
                 SetTimelineStatus (TimelineStatus.active);

Assets/_Project/Scripts/Data/Timeline.cs

@@ -11,13 +11,15 @@ protected PlayerManager () { }
     //listeners
     void OnEnable ()
     {
-        EventManager.StartListening ("ResetPlayers", ResetPlayers);
-        EventManager.StartListening ("ClearNonActivePlayers", ClearNonActivePlayers);
+        EventManager.StartListening ("AddAllPlayers", AddAllPlayers);
+        EventManager.StartListening ("RemoveAllPlayers", RemoveAllPlayers);
+        EventManager.StartListening ("CheckUpdatePlayers", CheckUpdatePlayers);
     }
     void OnDisable ()
     {
-        EventManager.StopListening ("ResetPlayers", ResetPlayers);
-        EventManager.StopListening ("ClearNonActivePlayers", ClearNonActivePlayers);
+        EventManager.StopListening ("AddAllPlayers", AddAllPlayers);
+        EventManager.StopListening ("RemoveAllPlayers", RemoveAllPlayers);
+        EventManager.StopListening ("CheckUpdatePlayers", CheckUpdatePlayers);
     }
 
 
@@ -38,6 +40,7 @@ void OnDisable ()
     public BoxCollider worldContainerCollider;
     public GameObject playerPrefab;
     public Dictionary<string, GameObject> playerDict;
+    public Dictionary<string, GameObject> playersToRemoveDict;
     public CameraManager cameraManager;
 
     // temp sprites for assigning avatars
@@ -51,6 +54,7 @@ void OnDisable ()
     // player currently showing an event
     public GameObject currentPlayerObj;
     public Player currentPlayerScript;
+    public string currentEventType;
 
 
 
@@ -82,37 +86,94 @@ private void Awake ()
     }
 
 
+
+
+
+
+
+
+
+
+
+
+
     /**
-     *  Remove all players from stage, reset dict
+     *  Add all players to screen and dict - called at start or after data reset
+     *  - called when Timeline.status == TimelineStatus.newDataReceived
      */
-    public void ResetPlayers ()
+    void AddAllPlayers ()
     {
-        // remove any players first?
+        Debug.Log ("PlayerManager.AddAllPlayers()");
 
-        // clear the dictionary 
-        playerDict.Clear ();
-
-        // loop through the buffer and add players
+        // loop through the buffer and add players to scene and dict
         foreach (var feed in Timeline.Instance.buffer) {
+            // max hasn't been reached
+            if (playerDict.Count > maxPlayersAllowed) break;
+            // check if player exists and add if not 
             CreateNewPlayer (feed.username, feed.avatarPath);
         }
         foreach (var feed in Timeline.Instance.history) {
+            // max hasn't been reached
+            if (playerDict.Count > maxPlayersAllowed) break;
+            // check if player exists and add if not 
             CreateNewPlayer (feed.username, feed.avatarPath);
         }
 
-        // update player count
-        playerCount = playerDict.Count;
+        UpdateCounts ();
 
-        // trigger data updated event
-        EventManager.TriggerEvent ("PlayersUpdated");
     }
 
+
     /**
-    *  Remove players who haven't been active in a while
-    */
-    public void ClearNonActivePlayers ()
+     *  Remove all players from screen and dict
+     *  - called from Timeline.OnStartBtnClick() to stop timeline / reset data
+     */
+    void RemoveAllPlayers ()
     {
+        Debug.Log ("PlayerManager.RemoveAllPlayers()");
+
+        // for each in playerDict, remove from scene
+        foreach (KeyValuePair<string, GameObject> kvp in playerDict) {
+            Destroy (kvp.Value);
+        }
 
+        // clear the dictionary 
+        playerDict.Clear ();
+        // update the count
+        UpdateCounts ();
+    }
+
+
+    /**
+     *  - called when Timeline.status == TimelineStatus.newDataReceived
+     */
+    void CheckUpdatePlayers ()
+    {
+        Debug.Log ("PlayerManager.CheckUpdatePlayers()");
+
+        //      - make a copy of the current player dict -> playersToRemoveDict
+        //      - for each event/player in current buffer and history
+        //          - if player found in playerDict
+        //              - remove from playersToRemoveDict
+        //          - else
+        //              - add to playerDict / scene
+        //          - add ALL players until max per resolution
+        //      - if players still left in playersToRemoveDict
+        //          - remove those players from scene and clear dict
+        //      - update counts
+
+
+
+        UpdateCounts ();
+    }
+
+
+
+
+    void UpdateCounts ()
+    {
+        // update player count
+        playerCount = playerDict.Count;
 
         // trigger data updated event
         EventManager.TriggerEvent ("PlayersUpdated");
@@ -123,13 +184,16 @@ public void ClearNonActivePlayers ()
 
 
 
+
+
+
     /**
      *  Create a new player
      */
-    public void CreateNewPlayer (string username, string avatarPath)
+    public bool CreateNewPlayer (string username, string avatarPath)
     {
         // make sure the player doesn't already exist
-        if (playerDict.ContainsKey (username)) return;
+        if (playerDict.ContainsKey (username)) return false;
 
         // get a position that doesn't contain any other colliders
         Vector3 spawnPosition = GetClearSpawnPosition ();
@@ -159,6 +223,7 @@ public void CreateNewPlayer (string username, string avatarPath)
             // Allow the player to be selected by the camera
             cameraManager.AddPlayer (username);
         }
+        return true;
     }
 
 
@@ -181,6 +246,12 @@ public void PlayEvent (FeedData feed)
         // reference to script (contains all the other references we need)
         currentPlayerScript = currentPlayerObj.GetComponent<Player> ();
 
+        // show event in public var
+        currentEventType = feed.eventType;
+
+
+
+
 
         // EFFECTS