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

default unijson

Browse Source
This commit is contained in:
hirose
2019-12-13 22:06:02 +09:00
parent 583f5c273a
commit 2f042520bc
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/VRM/UniGLTF/Scripts/Format/SerializerTypes.cs
View File

@@ -2,7 +2,7 @@
{
public enum SerializerTypes
{
JsonSerializable, // manual
JsonSerializable, // manual, Obsolete
UniJSON, // reflection
Generated, // generated, experimental for mobile
}

3
Assets/VRM/UniGLTF/Scripts/Format/glTF.cs
View File

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

10
Assets/VRM/UniGLTF/Scripts/IO/ImporterContext.cs
View File

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