diff --git a/Assets/VRM/UniGLTF/Editor/Tests/UniGLTFTests.cs b/Assets/VRM/UniGLTF/Editor/Tests/UniGLTFTests.cs index 067cdb83f..1db2c13fa 100644 --- a/Assets/VRM/UniGLTF/Editor/Tests/UniGLTFTests.cs +++ b/Assets/VRM/UniGLTF/Editor/Tests/UniGLTFTests.cs @@ -666,10 +666,7 @@ namespace UniGLTF // import new version { - var context = new ImporterContext - { - SerializerType = SerializerTypes.UniJSON - }; + var context = new ImporterContext(); context.ParseJson(json, new SimpleStorage(new ArraySegment(new byte[1024 * 1024]))); //Debug.LogFormat("{0}", context.Json); context.Load(); diff --git a/Assets/VRM/UniGLTF/Scripts/Format/SerializerTypes.cs b/Assets/VRM/UniGLTF/Scripts/Format/SerializerTypes.cs index 9dc459c36..fcdee0804 100644 --- a/Assets/VRM/UniGLTF/Scripts/Format/SerializerTypes.cs +++ b/Assets/VRM/UniGLTF/Scripts/Format/SerializerTypes.cs @@ -2,8 +2,8 @@ { public enum SerializerTypes { + Generated, // generated, No AOT Problem JsonSerializable, // manual, Obsolete - UniJSON, // reflection - Generated, // generated, experimental for mobile + UniJSON, // reflection, Obsolete } } diff --git a/Assets/VRM/UniGLTF/Scripts/Format/glTF.cs b/Assets/VRM/UniGLTF/Scripts/Format/glTF.cs index f7de69655..b9be6d1b6 100644 --- a/Assets/VRM/UniGLTF/Scripts/Format/glTF.cs +++ b/Assets/VRM/UniGLTF/Scripts/Format/glTF.cs @@ -427,10 +427,10 @@ namespace UniGLTF void Traverse(ListTreeNode node, JsonFormatter f, Utf8String parentKey) { - if(node.IsMap()) + if (node.IsMap()) { f.BeginMap(); - foreach(var kv in node.ObjectItems()) + foreach (var kv in node.ObjectItems()) { if (parentKey == s_extensions) { @@ -444,10 +444,10 @@ namespace UniGLTF } f.EndMap(); } - else if(node.IsArray()) + else if (node.IsArray()) { f.BeginList(); - foreach(var x in node.ArrayItems()) + foreach (var x in node.ArrayItems()) { Traverse(x, f, default(Utf8String)); } @@ -468,11 +468,12 @@ namespace UniGLTF return f.ToString(); } - public byte[] ToGlbBytes(SerializerTypes serializer = SerializerTypes.UniJSON) + public byte[] ToGlbBytes(SerializerTypes serializer = SerializerTypes.Generated) { string json; if (serializer == SerializerTypes.UniJSON) { + // Obsolete var c = new JsonSchemaValidationContext(this) { EnableDiagnosisForNotRequiredFields = true, @@ -485,7 +486,7 @@ namespace UniGLTF f.GenSerialize(this); json = f.ToString().ParseAsJson().ToString(" "); } - else if(serializer == SerializerTypes.JsonSerializable) + else if (serializer == SerializerTypes.JsonSerializable) { // Obsolete json = ToJson(); diff --git a/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs b/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs index b1dcafbad..0da87dba6 100644 --- a/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs +++ b/Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs @@ -271,7 +271,7 @@ namespace UniGLTF } } - private SerializerTypes _serializerType = SerializerTypes.UniJSON; + private SerializerTypes _serializerType = SerializerTypes.Generated; public SerializerTypes SerializerType { get { return _serializerType; } set { _serializerType = value; } } public virtual void ParseJson(string json, IStorage storage) @@ -281,6 +281,7 @@ namespace UniGLTF if (_serializerType == SerializerTypes.UniJSON) { + // Obsolete Json.ParseAsJson().Deserialize(ref GLTF); } else if (_serializerType == SerializerTypes.Generated) diff --git a/Assets/VRM/UniVRM/Editor/Format/VRMEditorExporter.cs b/Assets/VRM/UniVRM/Editor/Format/VRMEditorExporter.cs index 0e5902c8a..d74dd2cc5 100644 --- a/Assets/VRM/UniVRM/Editor/Format/VRMEditorExporter.cs +++ b/Assets/VRM/UniVRM/Editor/Format/VRMEditorExporter.cs @@ -231,7 +231,7 @@ namespace VRM // vrm.extensions.VRM.meta.contactInformation = settings.ContactInformation; // vrm.extensions.VRM.meta.reference = settings.Reference; - var bytes = vrm.ToGlbBytes(settings.UseExperimentalExporter ? SerializerTypes.Generated : SerializerTypes.UniJSON); + var bytes = vrm.ToGlbBytes(); File.WriteAllBytes(path, bytes); Debug.LogFormat("Export elapsed {0}", sw.Elapsed); } diff --git a/Assets/VRM/UniVRM/Editor/Format/VRMExportSettings.cs b/Assets/VRM/UniVRM/Editor/Format/VRMExportSettings.cs index 9c2dc96e5..154443c4a 100644 --- a/Assets/VRM/UniVRM/Editor/Format/VRMExportSettings.cs +++ b/Assets/VRM/UniVRM/Editor/Format/VRMExportSettings.cs @@ -18,12 +18,6 @@ namespace VRM [Tooltip("Require only first time")] public bool PoseFreeze = true; - /// - /// エクスポート時に新しいJsonSerializerを使う - /// - [Tooltip("Use new JSON serializer")] - public bool UseExperimentalExporter = false; - /// /// BlendShapeのシリアライズにSparseAccessorを使う ///