Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-04-05 01:05:17 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

remove dependency on UniJson from format

Browse Source
This commit is contained in:
ousttrue 2021-04-19 13:33:44 +09:00
parent 1e851de121
commit da5133ebdf
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/UniGLTF/Editor/Generator/DeserializerWriter.cs
View File

@ -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;

3
Assets/UniGLTF/Editor/Generator/FormatWriter.cs
View File

@ -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}
{{

3
Assets/VRM10/Runtime/Format/Constraints/Deserializer.g.cs
View File

@ -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;

3
Assets/VRM10/Runtime/Format/Constraints/Format.g.cs
View File

@ -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;

3
Assets/VRM10/Runtime/Format/MaterialsMToon/Deserializer.g.cs
View File

@ -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;

3
Assets/VRM10/Runtime/Format/MaterialsMToon/Format.g.cs
View File

@ -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;

3
Assets/VRM10/Runtime/Format/SpringBone/Deserializer.g.cs
View File

@ -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;

3
Assets/VRM10/Runtime/Format/SpringBone/Format.g.cs
View File

@ -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;

3
Assets/VRM10/Runtime/Format/Vrm/Deserializer.g.cs
View File

@ -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;

3
Assets/VRM10/Runtime/Format/Vrm/Format.g.cs
View File

@ -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;

4
Assets/VRM10/Tests/MigrationTests.cs
View File

@ -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);
}