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

JsonNodeへのパースを共通化

Browse Source
This commit is contained in:
momoma-null
2026-06-10 14:54:25 +09:00
committed by hadashiA
parent 7bcf2f6496
commit 39531b1ce6
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Packages/UniGLTF/Runtime/UniGLTF/IO/Parser/GlbLowLevelParser.cs
View File

@@ -80,15 +80,14 @@ namespace UniGLTF
internal static GltfData ParseGltf(string path, Utf8String json, IReadOnlyList<GlbChunk> chunks, IStorage storage, MigrationFlags migrationFlags)
{
var parsedJson = json.ParseAsJson();
var GLTF = GltfDeserializer.Deserialize(parsedJson);
if (GLTF.asset.version != "2.0")
var jsonNode = json.ParseAsJson();
var GLTF = GltfDeserializer.Deserialize(jsonNode);
{
throw new UniGLTFException("unknown gltf version {0}", GLTF.asset.version);
}
// Version Compatibility
RestoreOlderVersionValues(parsedJson, GLTF);
RestoreOlderVersionValues(jsonNode, GLTF);
FixMeshNameUnique(GLTF);
FixBlendShapeNameUnique(GLTF);
@@ -306,7 +305,7 @@ namespace UniGLTF
}
}
private static void RestoreOlderVersionValues(JsonNode parsed, glTF GLTF)
private static void RestoreOlderVersionValues(JsonNode jsonNode, glTF GLTF)
{
for (int i = 0; i < GLTF.images.Count; ++i)
{
@@ -314,7 +313,7 @@ namespace UniGLTF
{
try
{
var extraName = parsed["images"][i]["extra"]["name"].Value.GetString();
var extraName = jsonNode["images"][i]["extra"]["name"].Value.GetString();
if (!string.IsNullOrEmpty(extraName))
{
GLTF.images[i].name = extraName;