Skip to content

Commit bed276c

Browse files
committed
Use UnityWebRequest instead of WWW
Signed-off-by: Kunlin Yu <yukunlin@syriusrobotics.com>
1 parent 04a5d49 commit bed276c

File tree

3 files changed

+38
-12
lines changed

3 files changed

+38
-12
lines changed

Assets/StandaloneFileBrowser/Sample/CanvasSampleOpenFileImage.cs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using UnityEngine;
66
using UnityEngine.UI;
77
using UnityEngine.EventSystems;
8+
using UnityEngine.Networking;
89
using SFB;
910

1011
[RequireComponent(typeof(Button))]
@@ -46,8 +47,16 @@ private void OnClick() {
4647
#endif
4748

4849
private IEnumerator OutputRoutine(string url) {
49-
var loader = new WWW(url);
50-
yield return loader;
51-
output.texture = loader.texture;
50+
UnityWebRequest www = UnityWebRequestTexture.GetTexture(url);
51+
yield return www.SendWebRequest();
52+
53+
if (www.result != UnityWebRequest.Result.Success)
54+
{
55+
Debug.LogError(www.error);
56+
}
57+
else
58+
{
59+
output.texture = ((DownloadHandlerTexture)www.downloadHandler).texture;
60+
}
5261
}
5362
}

Assets/StandaloneFileBrowser/Sample/CanvasSampleOpenFileText.cs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using UnityEngine;
66
using UnityEngine.UI;
77
using UnityEngine.EventSystems;
8+
using UnityEngine.Networking;
89
using SFB;
910

1011
[RequireComponent(typeof(Button))]
@@ -46,8 +47,16 @@ private void OnClick() {
4647
#endif
4748

4849
private IEnumerator OutputRoutine(string url) {
49-
var loader = new WWW(url);
50-
yield return loader;
51-
output.text = loader.text;
50+
UnityWebRequest www = UnityWebRequest.Get(url);
51+
yield return www.SendWebRequest();
52+
53+
if (www.result != UnityWebRequest.Result.Success)
54+
{
55+
Debug.LogError(www.error);
56+
}
57+
else
58+
{
59+
output.text = www.downloadHandler.text;
60+
}
5261
}
5362
}

Assets/StandaloneFileBrowser/Sample/CanvasSampleOpenFileTextMultiple.cs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
using System.Text;
21
using System.Collections;
32
using System.Collections.Generic;
4-
using System.Runtime.InteropServices;
53
using UnityEngine;
64
using UnityEngine.UI;
75
using UnityEngine.EventSystems;
6+
using UnityEngine.Networking;
87
using SFB;
98

109
[RequireComponent(typeof(Button))]
@@ -52,10 +51,19 @@ private void OnClick() {
5251

5352
private IEnumerator OutputRoutine(string[] urlArr) {
5453
var outputText = "";
55-
for (int i = 0; i < urlArr.Length; i++) {
56-
var loader = new WWW(urlArr[i]);
57-
yield return loader;
58-
outputText += loader.text;
54+
for (int i = 0; i < urlArr.Length; i++)
55+
{
56+
UnityWebRequest www = UnityWebRequest.Get(urlArr[i]);
57+
yield return www.SendWebRequest();
58+
59+
if (www.result != UnityWebRequest.Result.Success)
60+
{
61+
Debug.LogError(www.error);
62+
}
63+
else
64+
{
65+
outputText += www.downloadHandler.text;
66+
}
5967
}
6068
output.text = outputText;
6169
}

0 commit comments

Comments
 (0)