From da5133ebdf02fcbb3e0db2692fc2531a1690dd67 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 19 Apr 2021 13:33:44 +0900 Subject: [PATCH] remove dependency on UniJson from format --- Assets/UniGLTF/Editor/Generator/DeserializerWriter.cs | 3 ++- Assets/UniGLTF/Editor/Generator/FormatWriter.cs | 3 +-- Assets/VRM10/Runtime/Format/Constraints/Deserializer.g.cs | 3 ++- Assets/VRM10/Runtime/Format/Constraints/Format.g.cs | 3 +-- Assets/VRM10/Runtime/Format/MaterialsMToon/Deserializer.g.cs | 3 ++- Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs | 3 +-- Assets/VRM10/Runtime/Format/SpringBone/Deserializer.g.cs | 3 ++- Assets/VRM10/Runtime/Format/SpringBone/Format.g.cs | 3 +-- Assets/VRM10/Runtime/Format/Vrm/Deserializer.g.cs | 3 ++- Assets/VRM10/Runtime/Format/Vrm/Format.g.cs | 3 +-- Assets/VRM10/Tests/MigrationTests.cs | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Assets/UniGLTF/Editor/Generator/DeserializerWriter.cs b/Assets/UniGLTF/Editor/Generator/DeserializerWriter.cs index d5ce549cb..eaae7f986 100644 --- a/Assets/UniGLTF/Editor/Generator/DeserializerWriter.cs +++ b/Assets/UniGLTF/Editor/Generator/DeserializerWriter.cs @@ -16,6 +16,7 @@ namespace UniGLTF.Extensions.$0 { public static class GltfDeserializer { + public static readonly Utf8String ExtensionNameUtf8 = Utf8String.From($0.ExtensionName); public static bool TryGet(UniGLTF.glTFExtension src, out $0 extension) { @@ -23,7 +24,7 @@ public static bool TryGet(UniGLTF.glTFExtension src, out $0 extension) { foreach(var kv in extensions.ObjectItems()) { - if(kv.Key.GetUtf8String() == $0.ExtensionNameUtf8) + if(kv.Key.GetUtf8String() == ExtensionNameUtf8) { extension = Deserialize(kv.Value); return true; diff --git a/Assets/UniGLTF/Editor/Generator/FormatWriter.cs b/Assets/UniGLTF/Editor/Generator/FormatWriter.cs index d102bd91f..781625a2e 100644 --- a/Assets/UniGLTF/Editor/Generator/FormatWriter.cs +++ b/Assets/UniGLTF/Editor/Generator/FormatWriter.cs @@ -81,7 +81,6 @@ namespace GenerateUniGLTFSerialization { var indent = " "; m_w.WriteLine($"{indent}public const string ExtensionName = \"{rootName}\";"); - m_w.WriteLine($"{indent}public static readonly Utf8String ExtensionNameUtf8 = Utf8String.From(ExtensionName);"); m_w.WriteLine(); } @@ -179,7 +178,7 @@ namespace GenerateUniGLTFSerialization using System; using System.Collections.Generic; using UniGLTF; -using UniJSON; + namespace UniGLTF.Extensions.{rootName} {{ diff --git a/Assets/VRM10/Runtime/Format/Constraints/Deserializer.g.cs b/Assets/VRM10/Runtime/Format/Constraints/Deserializer.g.cs index ce4d738a7..04fa4b622 100644 --- a/Assets/VRM10/Runtime/Format/Constraints/Deserializer.g.cs +++ b/Assets/VRM10/Runtime/Format/Constraints/Deserializer.g.cs @@ -8,6 +8,7 @@ namespace UniGLTF.Extensions.VRMC_node_constraint { public static class GltfDeserializer { + public static readonly Utf8String ExtensionNameUtf8 = Utf8String.From(VRMC_node_constraint.ExtensionName); public static bool TryGet(UniGLTF.glTFExtension src, out VRMC_node_constraint extension) { @@ -15,7 +16,7 @@ public static bool TryGet(UniGLTF.glTFExtension src, out VRMC_node_constraint ex { foreach(var kv in extensions.ObjectItems()) { - if(kv.Key.GetUtf8String() == VRMC_node_constraint.ExtensionNameUtf8) + if(kv.Key.GetUtf8String() == ExtensionNameUtf8) { extension = Deserialize(kv.Value); return true; diff --git a/Assets/VRM10/Runtime/Format/Constraints/Format.g.cs b/Assets/VRM10/Runtime/Format/Constraints/Format.g.cs index 13a812f1c..f1e80baa7 100644 --- a/Assets/VRM10/Runtime/Format/Constraints/Format.g.cs +++ b/Assets/VRM10/Runtime/Format/Constraints/Format.g.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UniGLTF; -using UniJSON; + namespace UniGLTF.Extensions.VRMC_node_constraint { @@ -128,7 +128,6 @@ namespace UniGLTF.Extensions.VRMC_node_constraint public class VRMC_node_constraint { public const string ExtensionName = "VRMC_node_constraint"; - public static readonly Utf8String ExtensionNameUtf8 = Utf8String.From(ExtensionName); // Dictionary object with extension-specific objects. public glTFExtension Extensions; diff --git a/Assets/VRM10/Runtime/Format/MaterialsMToon/Deserializer.g.cs b/Assets/VRM10/Runtime/Format/MaterialsMToon/Deserializer.g.cs index 3d6714e44..12cedff0c 100644 --- a/Assets/VRM10/Runtime/Format/MaterialsMToon/Deserializer.g.cs +++ b/Assets/VRM10/Runtime/Format/MaterialsMToon/Deserializer.g.cs @@ -8,6 +8,7 @@ namespace UniGLTF.Extensions.VRMC_materials_mtoon { public static class GltfDeserializer { + public static readonly Utf8String ExtensionNameUtf8 = Utf8String.From(VRMC_materials_mtoon.ExtensionName); public static bool TryGet(UniGLTF.glTFExtension src, out VRMC_materials_mtoon extension) { @@ -15,7 +16,7 @@ public static bool TryGet(UniGLTF.glTFExtension src, out VRMC_materials_mtoon ex { foreach(var kv in extensions.ObjectItems()) { - if(kv.Key.GetUtf8String() == VRMC_materials_mtoon.ExtensionNameUtf8) + if(kv.Key.GetUtf8String() == ExtensionNameUtf8) { extension = Deserialize(kv.Value); return true; diff --git a/Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs b/Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs index 1812ab9cb..f6b5d2f5b 100644 --- a/Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs +++ b/Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UniGLTF; -using UniJSON; + namespace UniGLTF.Extensions.VRMC_materials_mtoon { @@ -51,7 +51,6 @@ namespace UniGLTF.Extensions.VRMC_materials_mtoon public class VRMC_materials_mtoon { public const string ExtensionName = "VRMC_materials_mtoon"; - public static readonly Utf8String ExtensionNameUtf8 = Utf8String.From(ExtensionName); // Dictionary object with extension-specific objects. public glTFExtension Extensions; diff --git a/Assets/VRM10/Runtime/Format/SpringBone/Deserializer.g.cs b/Assets/VRM10/Runtime/Format/SpringBone/Deserializer.g.cs index 1d6b3a46c..28fe96538 100644 --- a/Assets/VRM10/Runtime/Format/SpringBone/Deserializer.g.cs +++ b/Assets/VRM10/Runtime/Format/SpringBone/Deserializer.g.cs @@ -8,6 +8,7 @@ namespace UniGLTF.Extensions.VRMC_springBone { public static class GltfDeserializer { + public static readonly Utf8String ExtensionNameUtf8 = Utf8String.From(VRMC_springBone.ExtensionName); public static bool TryGet(UniGLTF.glTFExtension src, out VRMC_springBone extension) { @@ -15,7 +16,7 @@ public static bool TryGet(UniGLTF.glTFExtension src, out VRMC_springBone extensi { foreach(var kv in extensions.ObjectItems()) { - if(kv.Key.GetUtf8String() == VRMC_springBone.ExtensionNameUtf8) + if(kv.Key.GetUtf8String() == ExtensionNameUtf8) { extension = Deserialize(kv.Value); return true; diff --git a/Assets/VRM10/Runtime/Format/SpringBone/Format.g.cs b/Assets/VRM10/Runtime/Format/SpringBone/Format.g.cs index b4124a382..1cab35b19 100644 --- a/Assets/VRM10/Runtime/Format/SpringBone/Format.g.cs +++ b/Assets/VRM10/Runtime/Format/SpringBone/Format.g.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UniGLTF; -using UniJSON; + namespace UniGLTF.Extensions.VRMC_springBone { @@ -114,7 +114,6 @@ namespace UniGLTF.Extensions.VRMC_springBone public class VRMC_springBone { public const string ExtensionName = "VRMC_springBone"; - public static readonly Utf8String ExtensionNameUtf8 = Utf8String.From(ExtensionName); // Dictionary object with extension-specific objects. public glTFExtension Extensions; diff --git a/Assets/VRM10/Runtime/Format/Vrm/Deserializer.g.cs b/Assets/VRM10/Runtime/Format/Vrm/Deserializer.g.cs index fef0de1f1..20a866f87 100644 --- a/Assets/VRM10/Runtime/Format/Vrm/Deserializer.g.cs +++ b/Assets/VRM10/Runtime/Format/Vrm/Deserializer.g.cs @@ -8,6 +8,7 @@ namespace UniGLTF.Extensions.VRMC_vrm { public static class GltfDeserializer { + public static readonly Utf8String ExtensionNameUtf8 = Utf8String.From(VRMC_vrm.ExtensionName); public static bool TryGet(UniGLTF.glTFExtension src, out VRMC_vrm extension) { @@ -15,7 +16,7 @@ public static bool TryGet(UniGLTF.glTFExtension src, out VRMC_vrm extension) { foreach(var kv in extensions.ObjectItems()) { - if(kv.Key.GetUtf8String() == VRMC_vrm.ExtensionNameUtf8) + if(kv.Key.GetUtf8String() == ExtensionNameUtf8) { extension = Deserialize(kv.Value); return true; diff --git a/Assets/VRM10/Runtime/Format/Vrm/Format.g.cs b/Assets/VRM10/Runtime/Format/Vrm/Format.g.cs index 60319c844..cd68e6472 100644 --- a/Assets/VRM10/Runtime/Format/Vrm/Format.g.cs +++ b/Assets/VRM10/Runtime/Format/Vrm/Format.g.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using UniGLTF; -using UniJSON; + namespace UniGLTF.Extensions.VRMC_vrm { @@ -478,7 +478,6 @@ namespace UniGLTF.Extensions.VRMC_vrm public class VRMC_vrm { public const string ExtensionName = "VRMC_vrm"; - public static readonly Utf8String ExtensionNameUtf8 = Utf8String.From(ExtensionName); // Specification version of the VRM public string SpecVersion; diff --git a/Assets/VRM10/Tests/MigrationTests.cs b/Assets/VRM10/Tests/MigrationTests.cs index e60a69d51..5329888b6 100644 --- a/Assets/VRM10/Tests/MigrationTests.cs +++ b/Assets/VRM10/Tests/MigrationTests.cs @@ -54,9 +54,9 @@ namespace UniVRM10 var json = glb.Json.Bytes.ParseAsJson(); var gltf = UniGLTF.GltfDeserializer.Deserialize(json); - MigrationVrm.Check(vrm0Json, GetExtension(gltf.extensions, UniGLTF.Extensions.VRMC_vrm.VRMC_vrm.ExtensionNameUtf8, + MigrationVrm.Check(vrm0Json, GetExtension(gltf.extensions, UniGLTF.Extensions.VRMC_vrm.GltfDeserializer.ExtensionNameUtf8, UniGLTF.Extensions.VRMC_vrm.GltfDeserializer.Deserialize)); - MigrationVrm.Check(vrm0Json, GetExtension(gltf.extensions, UniGLTF.Extensions.VRMC_springBone.VRMC_springBone.ExtensionNameUtf8, + MigrationVrm.Check(vrm0Json, GetExtension(gltf.extensions, UniGLTF.Extensions.VRMC_springBone.GltfDeserializer.ExtensionNameUtf8, UniGLTF.Extensions.VRMC_springBone.GltfDeserializer.Deserialize), gltf.nodes); }