Adds player data from feed to playerDetailsUI, update lights

Author: omundy

Assets/_Project/Prefabs/UI/PlayerDetailsCanvas.prefab

@@ -210,10 +210,12 @@ IEnumerator Transition ()
                 yield return 0;
             }
             cameraMoving = false;
+            //Debug.Log (cameraTarget.GetComponentInParent<Player> ().feedData.username.ToString ());
+            playerDetails.updateData (cameraTarget.GetComponentInParent<Player> ().feedData);
             playerDetails.playerPanel.SetActive (true);
-            playerDetails.setUI (cameraTarget.GetComponentInParent<Player> ().username, "1", "1", "1", "1", "1", "1", "1");
         }
 
+
         /// ARCHIVED TRANSITION IN CASE YOU NEED IT LATER
         /// FEEL FREE TO DELETE AT ANY POINT
         //float longestD = Vector2.Distance(mainCamera.transform.position, cameraTarget.transform.position);
@@ -236,7 +238,7 @@ IEnumerator Transition ()
     }
 
     /// <summary>
-    /// Moves the camera to the targetPosition
+    /// Moves the camera to the targetPosition (used for zooming out)
     /// </summary>
     /// <param name="targetPosition"> Vector3 location to move the camera to </param>
     IEnumerator Transition (Vector3 targetPosition)
@@ -256,7 +258,7 @@ IEnumerator Transition (Vector3 targetPosition)
                 yield return 0;
             }
             cameraMoving = false;
-            playerDetails.setUI (cameraTarget.GetComponentInParent<Player> ().username, "1", "1", "1", "1", "1", "1", "1");
+            playerDetails.updateData (cameraTarget.GetComponentInParent<Player> ().feedData);
         }
     }
 
@@ -284,8 +286,8 @@ IEnumerator ZoomIn ()
             }
             cameraZooming = false;
             cameraZoomed = true;
+            playerDetails.updateData (cameraTarget.GetComponentInParent<Player> ().feedData);
             playerDetails.playerPanel.SetActive (true);
-            playerDetails.setUI (cameraTarget.GetComponentInParent<Player> ().username, "1", "1", "1", "1", "1", "1", "1");
         }
     }
 

Assets/_Project/Scenes/tally-viz-master.unity

@@ -7,6 +7,7 @@ public class Player : MonoBehaviour {
 
     // META
 
+    public FeedData feedData;
     public string username;
     public string avatarPath;
     public bool effectIsPlaying;
@@ -29,12 +30,13 @@ private void Awake ()
         StartCoroutine (StartChecks ());
     }
 
-    public void Init (string _username, string _avatarPath)
+    public void Init (FeedData _feedData)
     {
         //Debug.Log ("Player.Init() _username = " + _username);
 
-        username = _username;
-        avatarPath = _avatarPath;
+        feedData = _feedData;
+        username = _feedData.username;
+        avatarPath = _feedData.avatarPath;
         lastActive = DateTime.Now;
     }
 

Assets/_Project/Scripts/Effects/CameraManager.cs

@@ -0,0 +1,70 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine.UI;
+using TMPro;
+using UnityEngine;
+
+public class PlayerDetailsUI : MonoBehaviour {
+
+    // references
+    public GameObject playerPanel;
+    public TMP_Text usernameText;
+    public TMP_Text dataText;
+
+    // current data index displayed
+    public int dataIndex = 0;
+    public string [] dataArray = new string [9];
+    private IEnumerator displayNewDataCoroutine;
+
+    private void Awake ()
+    {
+        // hide in case I left open
+        playerPanel.SetActive (false);
+
+        displayNewDataCoroutine = displayNewData ();
+        StartCoroutine (displayNewDataCoroutine);
+    }
+
+    void StopStartCouroutine ()
+    {
+        StopCoroutine (displayNewDataCoroutine);
+        dataIndex = 0;
+        StartCoroutine (displayNewDataCoroutine);
+    }
+
+    // Sets the UI text to be filled with player data
+    public void updateData (FeedData feedData)
+    {
+        // reset index
+        dataIndex = 0;
+        // update username 
+        usernameText.text = "<style=c3>" + feedData.username + "</style>";
+        // update data array 
+        dataArray = new string [9] {
+            "level: " + string.Format("{0,1:###,###,###.##}",feedData.level) + "",
+            "clicks: " + string.Format("{0,1:###,###,###.##}",feedData.clicks) + "",
+            "score: " + string.Format("{0,1:###,###,###.##}",feedData.score) + "",
+            "played: " + string.Format("{0,1:###,###,###.##}",(feedData.time / 60))  + " minutes",
+            "battles fought: " + string.Format("{0,1:###,###,###.##}",(feedData.capturedTotal + feedData.missedTotal)) + "",
+            "monsters captured: " + string.Format("{0,1:###,###,###.##}",feedData.capturedTotal) + "",
+            "scrolled: " + string.Format("{0,1:###,###,###.##}",(feedData.pageActionScrollDistance / 1000000)) + " km",
+            "trackers seen: " + string.Format("{0,1:###,###,###.##}",feedData.trackersSeen) + "",
+            "trackers blocked: " + string.Format("{0,1:###,###,###.##}",feedData.trackersBlocked) + "",
+        };
+        StopStartCouroutine ();
+    }
+
+    // Makes a different data visible every n seconds
+    IEnumerator displayNewData ()
+    {
+        while (true) {
+
+            dataText.text = "<style=c2>" + dataArray [dataIndex] + "</style>";
+
+            if (++dataIndex >= dataArray.Length)
+                dataIndex = 0;
+
+            yield return new WaitForSeconds (2f);
+        }
+    }
+}

Assets/_Project/Scripts/Effects/PlayerDetailsUI.cs

@@ -108,17 +108,17 @@ void AddAllPlayers ()
         Debug.Log ("PlayerManager.AddAllPlayers()");
 
         // loop through the buffer and add players to scene and dict
-        foreach (var feed in Timeline.Instance.buffer) {
+        foreach (var feedData 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);
+            CreateNewPlayer (feedData);
         }
-        foreach (var feed in Timeline.Instance.history) {
+        foreach (var feedData 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);
+            CreateNewPlayer (feedData);
         }
 
         UpdateCounts ();
@@ -161,30 +161,30 @@ void CheckUpdatePlayers ()
         GameObject player;
 
         // loop through the buffer
-        foreach (var feed in Timeline.Instance.buffer) {
+        foreach (var feedData in Timeline.Instance.buffer) {
             // if player still in playerDict
-            playerDict.TryGetValue (feed.username, out player);
+            playerDict.TryGetValue (feedData.username, out player);
             if (player != null) {
                 // remove from playersToRemoveDict
-                playersToRemoveDict.Remove (feed.username);
+                playersToRemoveDict.Remove (feedData.username);
             } else {
                 // max hasn't been reached
                 if (playerDict.Count > maxPlayersAllowed) break;
                 // check if player exists and add
-                CreateNewPlayer (feed.username, feed.avatarPath);
+                CreateNewPlayer (feedData);
             }
         }
-        foreach (var feed in Timeline.Instance.history) {
+        foreach (var feedData in Timeline.Instance.history) {
             // if player still in playerDict
-            playerDict.TryGetValue (feed.username, out player);
+            playerDict.TryGetValue (feedData.username, out player);
             if (player != null) {
                 // remove from playersToRemoveDict
-                playersToRemoveDict.Remove (feed.username);
+                playersToRemoveDict.Remove (feedData.username);
             } else {
                 // max hasn't been reached
                 if (playerDict.Count > maxPlayersAllowed) break;
                 // check if player exists and add
-                CreateNewPlayer (feed.username, feed.avatarPath);
+                CreateNewPlayer (feedData);
             }
         }
 
@@ -231,10 +231,10 @@ void UpdateCounts ()
     /**
      *  Create a new player
      */
-    public bool CreateNewPlayer (string username, string avatarPath)
+    public bool CreateNewPlayer (FeedData feedData)
     {
         // make sure the player doesn't already exist
-        if (playerDict.ContainsKey (username)) return false;
+        if (playerDict.ContainsKey (feedData.username)) return false;
 
         // get a position that doesn't contain any other colliders
         Vector3 spawnPosition = GetClearSpawnPosition ();
@@ -251,18 +251,18 @@ public bool CreateNewPlayer (string username, string avatarPath)
             // instantiate prefab @ spawn position
             GameObject obj = (GameObject)Instantiate (playerPrefab, spawnPosition, spawnRotation);
             // call Init() on Player
-            obj.GetComponent<Player> ().Init (username, avatarPath);
+            obj.GetComponent<Player> ().Init (feedData);
             // set name in Unity Editor
-            obj.name = username;
+            obj.name = feedData.username;
             // parent under PlayerManger
             obj.transform.parent = gameObject.transform;
             // finaly, add to dict
-            playerDict.Add (username, obj);
+            playerDict.Add (feedData.username, obj);
             // sets a reference to the cameraManager
             obj.GetComponent<Player> ().cameraManager = cameraManager;
 
             // Allow the player to be selected by the camera
-            cameraManager.AddPlayer (username);
+            cameraManager.AddPlayer (feedData.username);
         }
         return true;
     }
@@ -287,6 +287,9 @@ public void PlayEvent (FeedData feed)
         // reference to script (contains all the other references we need)
         currentPlayerScript = currentPlayerObj.GetComponent<Player> ();
 
+        // store FeedData for zoom 
+        currentPlayerScript.feedData = feed;
+
         // show event in public var
         currentEventType = feed.eventType;