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

improve JSON key cut off

Browse Source
This commit is contained in:
ousttrue
2019-08-06 00:55:15 +09:00
parent 7d02186220
commit 59802be7f9
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Assets/VRM/UniGLTF/Editor/SerializerGenerator.cs
View File

@@ -44,26 +44,27 @@ namespace UniGLTF
Stream m_s;
StreamWriter m_w;
static Dictionary<string, Func<FieldInfo, string>> s_snipets = new Dictionary<string, Func<FieldInfo, string>>
static Dictionary<string, string> s_snipets = new Dictionary<string, string>
{
{"animations", _ => "if(value.animations!=null && value.animations.Count>0)"},
{"cameras", _ => "if(value.cameras!=null && value.cameras.Count>0)"},
{"byteStride", _ => "if(false)"},
{"target", fi => fi.FieldType.IsClass ? "if(value!=null)" : "if(value.target!=0)" },
{"sparse", _ => "if(value.sparse!=null && value.sparse.count>0)"},
{"axisLength", _ => "if(value.axisLength>0)"},
{"center", fi => fi.FieldType == typeof(Vector3) ? "if(value.center!=Vector3.zero)" : "if(true)"},
{"max", fi => fi.FieldType == typeof(Vector3) ? "if(value.max!=Vector3.zero)" : "if(value.max!=null)"},
{"min", fi => fi.FieldType == typeof(Vector3) ? "if(value.min!=Vector3.zero)" : "if(value.min!=null)"},
{"targets", _ => "if(value.targets.Count>0)" },
{"alphaCutoff", _=> "if(false)" },
{"COLOR_0", _=> "if(value.COLOR_0!=-1)"},
{"extensionsRequired", _=>"if(false)"},
{"extras", fi=>fi.FieldType==typeof(glTFPrimitives_extras) ? "if(value.extras!=null && value.extras.targetNames!=null && value.extras.targetNames.Count>0)" : "if(value.extras!=null)"},
{"camera", _=> "if(value.camera!=-1)"},
{"mesh", _=> "if(value.mesh!=-1)"},
{"skin", _=> "if(value.skin!=-1)"},
{"skeleton", _=> "if(value.skeleton!=-1)"},
{"gltf/animations", "if(value.animations!=null && value.animations.Count>0)" },
{"gltf/cameras", "if(value.cameras!=null && value.cameras.Count>0)" },
{"gltf/bufferViews[]/byteStride", "if(false)" },
{"gltf/bufferViews[]/target", "if(value.target!=0)" },
{"gltf/animations[]/channels[]/target", "if(value!=null)" },
{"gltf/accessors[]/sparse", "if(value.sparse!=null && value.sparse.count>0)"},
{"gltf/meshes[]/primitives[]/targets", "if(value.targets.Count>0)" },
{"gltf/meshes[]/primitives[]/attributes/COLOR_0", "if(value.COLOR_0!=-1)"},
{"gltf/meshes[]/primitives[]/extras", "if(value.extras!=null && value.extras.targetNames!=null && value.extras.targetNames.Count>0)"},
{"gltf/materials[]/alphaCutoff", "if(!string.IsNullOrEmpty(value.alphaMode))" },
{"gltf/nodes[]/camera", "if(value.camera!=-1)"},
{"gltf/nodes[]/mesh", "if(value.mesh!=-1)"},
{"gltf/nodes[]/skin", "if(value.skin!=-1)"},
{"gltf/skins[]/skeleton", "if(value.skeleton!=-1)"},
{"gltf/extensionsRequired", "if(false)"},
{"gltf/extensions/VRM/humanoid/humanBones[]/axisLength", "if(value.axisLength>0)"},
{"gltf/extensions/VRM/humanoid/humanBones[]/center", "if(value.center!=Vector3.zero)"},
{"gltf/extensions/VRM/humanoid/humanBones[]/max", "if(value.max!=Vector3.zero)"},
{"gltf/extensions/VRM/humanoid/humanBones[]/min", "if(value.min!=Vector3.zero)"},
};
public Generator(string path)
@@ -247,10 +248,10 @@ namespace UniGLTF {
}
var snipet = fi.FieldType.IsClass ? "if(value." + fi.Name + "!=null)" : "";
Func<FieldInfo, string> func = null;
if (s_snipets.TryGetValue(fi.Name, out func))
var value = default(string);
if (s_snipets.TryGetValue(path + "/" + fi.Name, out value))
{
snipet = func(fi);
snipet = value;
}
m_w.Write(@"
@@ -277,4 +278,4 @@ namespace UniGLTF {
}
}
}
}
}

8
Assets/VRM/UniGLTF/Scripts/IO/FormatterExtensionsGltf.g.cs
View File

@@ -572,7 +572,7 @@ namespace UniGLTF {
f.Key("alphaMode"); f.GenSerialize(value.alphaMode);
}
if(false)
if(!string.IsNullOrEmpty(value.alphaMode))
{
f.Key("alphaCutoff"); f.GenSerialize(value.alphaCutoff);
}
@@ -1686,7 +1686,7 @@ namespace UniGLTF {
{
f.BeginMap(0); // dummy
if(value.mesh!=-1)
{
f.Key("mesh"); f.GenSerialize(value.mesh);
}
@@ -1795,7 +1795,7 @@ namespace UniGLTF {
{
f.BeginMap(0); // dummy
if(value.mesh!=-1)
{
f.Key("mesh"); f.GenSerialize(value.mesh);
}
@@ -1906,7 +1906,7 @@ namespace UniGLTF {
f.Key("dragForce"); f.GenSerialize(value.dragForce);
}
if(true)
{
f.Key("center"); f.GenSerialize(value.center);
}