Merge branch 'add-avatars'

Author: omundy

Assets/_Project/Prefabs/PlayerPrefab.prefab

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8af35b7c1bc91aa204a78519c4be0024b29f2085bac95b5ad458f4ea36bd9f16
-size 19646
+oid sha256:a0a43e3ef5debe8151d5424cc7a2f9daf97e5cec99557ddd808f1241adca16a6
+size 19701

Assets/_Project/Scenes/tally-viz.unity

@@ -2999,6 +2999,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: PlayerPrefab
       objectReference: {fileID: 0}
+    - target: {fileID: 9008334923571228613, guid: ecec1fc7bdc6441a691ca908dfadc8b4, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ecec1fc7bdc6441a691ca908dfadc8b4, type: 3}
 --- !u!1 &1339374947
@@ -3372,7 +3376,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -59.999916}
+  m_AnchoredPosition: {x: 0, y: -59.999973}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1617634874

Assets/_Project/Scripts/Players/Player.cs

@@ -7,11 +7,13 @@ public class Player : MonoBehaviour
 
 
     public string username;
+    public string avatarPath;
 
 
-    public void Init(string username)
+    public void Init(string username, string avatarPath)
     {
         this.username = username;
+        this.avatarPath = avatarPath;
     }
 
 

Assets/_Project/Scripts/Players/PlayerAvaterController.cs

@@ -1,20 +1,26 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Networking;
 
 public class PlayerAvaterController : MonoBehaviour {
 
 
     // temp sprites for assigning avatars
     public SpriteRenderer spriteRenderer;
     public SpriteMask spriteMask;
-
+    public Player player;
 
     void Start ()
     {
         spriteRenderer = GetComponent<SpriteRenderer> ();
-        // temp - choose random avatar
-        spriteRenderer.sprite = PlayerManager.Instance.avatars [Random.Range (0, PlayerManager.Instance.avatars.Length - 1)];
+
+        // if the file is a .gif
+        if (player.avatarPath.Contains (".gif"))
+            // choose random avatar
+            spriteRenderer.sprite = PlayerManager.Instance.avatars [Random.Range (0, PlayerManager.Instance.avatars.Length - 1)];
+        else
+            StartCoroutine (DownloadImage ("https://tallysavestheinternet.com/" + player.avatarPath));
 
         // set random sorting order
         spriteRenderer.sortingOrder = Random.Range (100, 10000);
@@ -26,5 +32,16 @@ void Start ()
 
     }
 
+    IEnumerator DownloadImage (string MediaUrl)
+    {
+        UnityWebRequest request = UnityWebRequestTexture.GetTexture (MediaUrl);
+        yield return request.SendWebRequest ();
+        if (request.isNetworkError || request.isHttpError)
+            Debug.Log (request.error + " " + MediaUrl);
+        else {
+            Texture2D onlineAvatar = ((DownloadHandlerTexture)request.downloadHandler).texture;
+            spriteRenderer.sprite = Sprite.Create (onlineAvatar, new Rect (0, 0, onlineAvatar.width, onlineAvatar.height), new Vector2 (0.5f, 0.5f));
+        }
+    }
 
 }

Assets/_Project/Scripts/Players/PlayerManager.cs

@@ -49,7 +49,7 @@ public void ResetPlayers ()
 
         // loop through the feed and add players
         foreach (var feed in DataManager.feeds) {
-            CreateNewPlayer (feed.username);
+            CreateNewPlayer (feed.username, feed.avatarPath);
         }
 
         // trigger data updated event
@@ -59,7 +59,7 @@ public void ResetPlayers ()
     /**
      *  Create a new player
      */
-    public void CreateNewPlayer (string username)
+    public void CreateNewPlayer (string username, string avatarPath)
     {
         // make sure the player doesn't already exist
         if (playerDict.ContainsKey (username)) return;
@@ -79,7 +79,7 @@ public void CreateNewPlayer (string username)
             // instantiate prefab @ spawn position
             GameObject obj = (GameObject)Instantiate (playerPrefab, spawnPosition, spawnRotation);
             // call Init() on Player
-            obj.GetComponent<Player> ().Init (username);
+            obj.GetComponent<Player> ().Init (username, avatarPath);
             // set name in Unity Editor
             obj.name = username;
             // parent under PlayerManger
@@ -166,6 +166,4 @@ public static Vector3 RandomPointInBounds (Bounds bounds)
         );
     }
 
-
-
 }