From b99a2c39ea7a2cd402b34d717f7724612e50fed4 Mon Sep 17 00:00:00 2001 From: yutopp Date: Wed, 16 Jan 2019 18:39:30 +0900 Subject: [PATCH] Rename variable names. Add exporting pass which using JsonSchema --- .../Editor/Tests/VRMImportExportTests.cs | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Assets/VRM.Samples/Editor/Tests/VRMImportExportTests.cs b/Assets/VRM.Samples/Editor/Tests/VRMImportExportTests.cs index fd910333e..3222dc800 100644 --- a/Assets/VRM.Samples/Editor/Tests/VRMImportExportTests.cs +++ b/Assets/VRM.Samples/Editor/Tests/VRMImportExportTests.cs @@ -1,5 +1,6 @@ using NUnit.Framework; using System.IO; +using UniGLTF; using UniJSON; using UnityEngine; @@ -41,15 +42,15 @@ namespace VRM.Samples using (new ActionDisposer(() => { GameObject.DestroyImmediate(context.Root); })) { - var importJson = JsonParser.Parse(context.Json); - importJson.SetValue("/extensions/VRM/exporterVersion", VRMVersion.VRM_VERSION); - importJson.SetValue("/asset/generator", UniGLTF.UniGLTFVersion.UNIGLTF_VERSION); - importJson.SetValue("/scene", 0); - importJson.SetValue("/materials/*/doubleSided", false); + var importedJson = JsonParser.Parse(context.Json); + importedJson.SetValue("/extensions/VRM/exporterVersion", VRMVersion.VRM_VERSION); + importedJson.SetValue("/asset/generator", UniGLTF.UniGLTFVersion.UNIGLTF_VERSION); + importedJson.SetValue("/scene", 0); + importedJson.SetValue("/materials/*/doubleSided", false); //importJson.SetValue("/materials/*/pbrMetallicRoughness/roughnessFactor", 0); //importJson.SetValue("/materials/*/pbrMetallicRoughness/baseColorFactor", new float[] { 1, 1, 1, 1 }); - importJson.SetValue("/accessors/*/normalized", false); - importJson.RemoveValue(Utf8String.From("/nodes/*/extras")); + importedJson.SetValue("/accessors/*/normalized", false); + importedJson.RemoveValue(Utf8String.From("/nodes/*/extras")); /* importJson.SetValue("/bufferViews/12/byteStride", 4); importJson.SetValue("/bufferViews/13/byteStride", 4); @@ -78,11 +79,14 @@ namespace VRM.Samples importJson.SetValue("/bufferViews/252/byteStride", 64); importJson.SetValue("/bufferViews/253/byteStride", 64); */ - importJson.RemoveValue(Utf8String.From("/bufferViews/*/byteStride")); + importedJson.RemoveValue(Utf8String.From("/bufferViews/*/byteStride")); var vrm = VRMExporter.Export(context.Root); + var exportJson = JsonParser.Parse(vrm.ToJson()); + var newExportedJson = JsonParser.Parse(JsonSchema.FromType().Serialize(vrm)); + /* foreach (var kv in importJson.Diff(exportJson)) {