diff --git a/Examples/OpenSeeWebcamInfo.cs b/Examples/OpenSeeWebcamInfo.cs index 6a4f478..bd118be 100644 --- a/Examples/OpenSeeWebcamInfo.cs +++ b/Examples/OpenSeeWebcamInfo.cs @@ -8,9 +8,6 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -// UniJSON is part of UniVRM (https://github.com/vrm-c/UniVRM) -using UniJSON; - namespace OpenSee { [Serializable] @@ -178,6 +175,11 @@ public class OpenSeeWebcamInfo : MonoBehaviour { private static extern void bm_get_json_x86([Out] StringBuilder namebuffer, int bufferlength); #endregion + [Serializable] + public class OpenSeeWebcamList { + public List list; + } + public List cameras; public bool dumpJson = false; @@ -232,15 +234,11 @@ public class OpenSeeWebcamInfo : MonoBehaviour { if (includeBlackMagic) UnityEngine.Debug.Log("Blackmagic JSON: " + bmJsonData); } - List details = new List(); - var parsed = JsonParser.Parse(jsonData); - parsed.Deserialize(ref details); + List details = JsonUtility.FromJson("{\"list\":" + jsonData + "}").list; foreach (var cam in details) cam.type = OpenSeeWebcamType.DirectShow; if (includeBlackMagic) { - List bmDetails = new List(); - parsed = JsonParser.Parse(bmJsonData); - parsed.Deserialize(ref bmDetails); + List bmDetails = JsonUtility.FromJson("{\"list\":" + bmJsonData + "}").list; foreach (var cam in bmDetails) cam.type = OpenSeeWebcamType.Blackmagic; details.AddRange(bmDetails); @@ -258,13 +256,5 @@ public class OpenSeeWebcamInfo : MonoBehaviour { foreach (var camera in cameras) camera.GetPrettyCapabilities(); } - - public static void AOTCall() { - GenericDeserializer.GenericArrayDeserializer(default(ListTreeNode)); - JsonObjectValidator.GenericDeserializer.DeserializeField(default(JsonSchema), default(ListTreeNode)); - JsonObjectValidator.GenericDeserializer.DeserializeField(default(JsonSchema), default(ListTreeNode)); - GenericDeserializer.GenericArrayDeserializer(default(ListTreeNode)); - throw new InvalidOperationException("This method is used for AOT code generation only. Do not call it at runtime."); - } } } \ No newline at end of file