Skip to content

Commit 06e893c

Browse files
committed
Add condition for .gif files
1 parent d6b1dba commit 06e893c

File tree

3 files changed

+61
-13
lines changed

3 files changed

+61
-13
lines changed

Assets/_Project/Scenes/tally-viz.unity

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2024,7 +2024,7 @@ MonoBehaviour:
20242024
m_HandleRect: {fileID: 489705913}
20252025
m_Direction: 2
20262026
m_Value: 0
2027-
m_Size: 0.83469206
2027+
m_Size: 1
20282028
m_NumberOfSteps: 0
20292029
m_OnValueChanged:
20302030
m_PersistentCalls:
@@ -3376,7 +3376,7 @@ RectTransform:
33763376
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
33773377
m_AnchorMin: {x: 0, y: 1}
33783378
m_AnchorMax: {x: 1, y: 1}
3379-
m_AnchoredPosition: {x: 0, y: -60.000004}
3379+
m_AnchoredPosition: {x: 0, y: -59.999973}
33803380
m_SizeDelta: {x: 0, y: 0}
33813381
m_Pivot: {x: 0.5, y: 0.5}
33823382
--- !u!114 &1617634874

Assets/_Project/Scripts/Players/PlayerAvaterController.cs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ void Start ()
1515
{
1616
spriteRenderer = GetComponent<SpriteRenderer> ();
1717

18-
// temp - choose random avatar
19-
// spriteRenderer.sprite = PlayerManager.Instance.avatars [Random.Range (0, PlayerManager.Instance.avatars.Length - 1)];
20-
21-
StartCoroutine(DownloadImage("https://tallysavestheinternet.com/" + player.avatarPath));
18+
// if the file is a .gif
19+
if (player.avatarPath.Contains (".gif"))
20+
// choose random avatar
21+
spriteRenderer.sprite = PlayerManager.Instance.avatars [Random.Range (0, PlayerManager.Instance.avatars.Length - 1)];
22+
else
23+
StartCoroutine (DownloadImage ("https://tallysavestheinternet.com/" + player.avatarPath));
2224

2325
// set random sorting order
2426
spriteRenderer.sortingOrder = Random.Range (100, 10000);
@@ -30,16 +32,15 @@ void Start ()
3032

3133
}
3234

33-
IEnumerator DownloadImage(string MediaUrl)
35+
IEnumerator DownloadImage (string MediaUrl)
3436
{
35-
UnityWebRequest request = UnityWebRequestTexture.GetTexture(MediaUrl);
36-
yield return request.SendWebRequest();
37+
UnityWebRequest request = UnityWebRequestTexture.GetTexture (MediaUrl);
38+
yield return request.SendWebRequest ();
3739
if (request.isNetworkError || request.isHttpError)
38-
Debug.Log(request.error + " " + MediaUrl);
39-
else
40-
{
40+
Debug.Log (request.error + " " + MediaUrl);
41+
else {
4142
Texture2D onlineAvatar = ((DownloadHandlerTexture)request.downloadHandler).texture;
42-
spriteRenderer.sprite = Sprite.Create(onlineAvatar, new Rect(0, 0, onlineAvatar.width, onlineAvatar.height), new Vector2(0.5f, 0.5f));
43+
spriteRenderer.sprite = Sprite.Create (onlineAvatar, new Rect (0, 0, onlineAvatar.width, onlineAvatar.height), new Vector2 (0.5f, 0.5f));
4344
}
4445
}
4546

Packages/packages-lock.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,45 @@
11
{
22
"dependencies": {
3+
"com.unity.2d.animation": {
4+
"version": "4.2.6",
5+
"depth": 1,
6+
"source": "registry",
7+
"dependencies": {
8+
"com.unity.2d.common": "3.0.1",
9+
"com.unity.mathematics": "1.1.0",
10+
"com.unity.2d.sprite": "1.0.0",
11+
"com.unity.modules.animation": "1.0.0",
12+
"com.unity.modules.uielements": "1.0.0"
13+
},
14+
"url": "https://packages.unity.com"
15+
},
16+
"com.unity.2d.common": {
17+
"version": "3.0.1",
18+
"depth": 1,
19+
"source": "registry",
20+
"dependencies": {
21+
"com.unity.2d.sprite": "1.0.0",
22+
"com.unity.modules.uielements": "1.0.0"
23+
},
24+
"url": "https://packages.unity.com"
25+
},
26+
"com.unity.2d.psdimporter": {
27+
"version": "3.1.6",
28+
"depth": 0,
29+
"source": "registry",
30+
"dependencies": {
31+
"com.unity.2d.common": "3.0.1",
32+
"com.unity.2d.animation": "4.2.6",
33+
"com.unity.2d.sprite": "1.0.0"
34+
},
35+
"url": "https://packages.unity.com"
36+
},
37+
"com.unity.2d.sprite": {
38+
"version": "1.0.0",
39+
"depth": 1,
40+
"source": "builtin",
41+
"dependencies": {}
42+
},
343
"com.unity.collab-proxy": {
444
"version": "1.3.8",
545
"depth": 0,
@@ -37,6 +77,13 @@
3777
"dependencies": {},
3878
"url": "https://packages.unity.com"
3979
},
80+
"com.unity.mathematics": {
81+
"version": "1.1.0",
82+
"depth": 2,
83+
"source": "registry",
84+
"dependencies": {},
85+
"url": "https://packages.unity.com"
86+
},
4087
"com.unity.render-pipelines.core": {
4188
"version": "8.2.0",
4289
"depth": 1,

0 commit comments

Comments
 (0)