From 2f042520bca35d046838ea260ae365a66f309561 Mon Sep 17 00:00:00 2001
From: hirose <j-hirose@virtualcast.jp>
Date: Fri, 13 Dec 2019 22:06:02 +0900
Subject: [PATCH] default unijson

---
 Assets/VRM/UniGLTF/Scripts/Format/SerializerTypes.cs |  2 +-
 Assets/VRM/UniGLTF/Scripts/Format/glTF.cs            |  3 ++-
 Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs     | 10 ++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Assets/VRM/UniGLTF/Scripts/Format/SerializerTypes.cs b/Assets/VRM/UniGLTF/Scripts/Format/SerializerTypes.cs
index 1a977ccae..9dc459c36 100644
--- a/Assets/VRM/UniGLTF/Scripts/Format/SerializerTypes.cs
+++ b/Assets/VRM/UniGLTF/Scripts/Format/SerializerTypes.cs
@@ -2,7 +2,7 @@
 {
     public enum SerializerTypes
     {
-        JsonSerializable, // manual
+        JsonSerializable, // manual, Obsolete
         UniJSON, // reflection
         Generated, // generated, experimental for mobile
     }
diff --git a/Assets/VRM/UniGLTF/Scripts/Format/glTF.cs b/Assets/VRM/UniGLTF/Scripts/Format/glTF.cs
index fade35412..95e3ce2be 100644
--- a/Assets/VRM/UniGLTF/Scripts/Format/glTF.cs
+++ b/Assets/VRM/UniGLTF/Scripts/Format/glTF.cs
@@ -468,7 +468,7 @@ namespace UniGLTF
             return f.ToString();
         }
 
-        public byte[] ToGlbBytes(SerializerTypes serializer = SerializerTypes.JsonSerializable)
+        public byte[] ToGlbBytes(SerializerTypes serializer = SerializerTypes.UniJSON)
         {
             string json;
             if (serializer == SerializerTypes.UniJSON)
@@ -487,6 +487,7 @@ namespace UniGLTF
             }
             else if(serializer == SerializerTypes.JsonSerializable)
             {
+                // Obsolete
                 json = ToJson();
             }
             else
diff --git a/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs b/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs
index 875763987..69630142f 100644
--- a/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs
+++ b/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs
@@ -260,23 +260,25 @@ namespace UniGLTF
                 new SimpleStorage(chunks[1].Bytes));
         }
 
-        public SerializerTypes SerializerType { get; set; }
+        private SerializerTypes _serializerType = SerializerTypes.UniJSON;
+        public SerializerTypes SerializerType { get { return _serializerType; } set { _serializerType = value; } }
 
         public virtual void ParseJson(string json, IStorage storage)
         {
             Json = json;
             Storage = storage;
 
-            if (SerializerType == SerializerTypes.UniJSON)
+            if (_serializerType == SerializerTypes.UniJSON)
             {
                 Json.ParseAsJson().Deserialize(ref GLTF);
             }
-            else if (SerializerType == SerializerTypes.Generated)
+            else if (_serializerType == SerializerTypes.Generated)
             {
                 GLTF = GltfDeserializer.Deserialize(json.ParseAsJson());
             }
-            else if (SerializerType == SerializerTypes.JsonSerializable)
+            else if (_serializerType == SerializerTypes.JsonSerializable)
             {
+                // Obsolete
                 GLTF = JsonUtility.FromJson<glTF>(Json);
             }