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

extensions が無い場合を追加

Browse Source
This commit is contained in:
ousttrue
2021-12-16 18:57:02 +09:00
parent 500b59d2ae
commit 805613b1fe
2 changed files with 86 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Assets/UniGLTF/Runtime/UniGLTF/IO/GltfJsonUtil.cs
View File

@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@@ -127,8 +126,52 @@ namespace UniGLTF
// 無いとき
if (parsed.ContainsKey(EXTENSION_USED_KEY))
{
// 消す
throw new NotImplementedException();
foreach (var kv in parsed.ObjectItems())
{
if (kv.Key.GetString() == EXTENSION_USED_KEY)
{
// 削除範囲は
// kv.Key の先頭から kv.Value の後ろ
// kv.Value の次の文字は , か } がありえる。
var begin = kv.Key.Value.Segment.Bytes.Offset;
var end = kv.Value.Value.Segment.Bytes.Offset + kv.Value.Value.Segment.Bytes.Count;
var array = kv.Key.Value.Segment.Bytes.Array;
for (var i = end; i < array.Length; ++i)
{
if (array[i] == ',')
{
end = i + 1;
break;
}
else if (array[i] == '}')
{
// begin 側の , を探す
for (var j = begin - 1; j >= 0; --j)
{
if (array[j] == ',')
{
begin = j;
break;
}
}
end = i;
break;
}
}
using (var w = new MemoryStream())
{
// before
w.Write(array, 0, begin);
// after
w.Write(array, end, array.Length - end);
// BOM 無し encoder
var utf8 = new UTF8Encoding(false);
src = utf8.GetString(w.ToArray());
}
}
}
}
else
{
@@ -150,8 +193,8 @@ namespace UniGLTF
// BOM 無し encoder
var utf8 = new UTF8Encoding(false);
var bytes = utf8.GetBytes(values);
var bytes = utf8.GetBytes(values);
using (var w = new MemoryStream())
{
// before

40
Assets/UniGLTF/Tests/UniGLTF/GltfJsonUtilTests.cs
View File

@@ -105,7 +105,7 @@ namespace UniGLTF
]
}
],
""extensionUsed"": [""dummy""],
""extensionUsed"": [""dummy""] ,
""materials"": [
{
""pbrMetallicRoughness"": {
@@ -125,5 +125,43 @@ namespace UniGLTF
var parsed = dst.ParseAsJson();
Assert.False(parsed.ContainsKey("extensionUsed"));
}
[Test]
public void Empty2_extensionUsed()
{
var dst = GltfJsonUtil.FindUsedExtensionsAndUpdateJson(@"{
""asset"": {
""generator"": ""COLLADA2GLTF"",
""version"": ""2.0""
},
""scene"": 0,
""scenes"": [
{
""nodes"": [
0
]
}
],
""materials"": [
{
""pbrMetallicRoughness"": {
""baseColorFactor"": [
0.800000011920929,
0.0,
0.0,
1.0
],
""metallicFactor"": 0.0
},
""name"": ""Red""
}
],
""extensionUsed"": [""dummy""]
}");
var parsed = dst.ParseAsJson();
Assert.False(parsed.ContainsKey("extensionUsed"));
}
}
}