Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-26 12:55:18 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2213 from tsgcpp/feature/fix_for_byteoffset_zero

Browse Source 
attributesのbufferViewは連続であるが、indicesのbufferViewがprimitivesの順番で連続ではないVRM0.xをロードするとエラーになる問題の対策
This commit is contained in:
ousttrue
2024-01-09 14:31:08 +09:00
committed by GitHub
parent 2c55dc9db0 e348360bce
commit 54295da228
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/VRM10/Runtime/IO/Vrm10ImportData.cs
View File

@@ -255,7 +255,8 @@ namespace UniVRM10
{
var firstAccessor = Gltf.accessors[accessorIndices[0]];
var firstView = Gltf.bufferViews[firstAccessor.bufferView.Value];
var start = firstView.byteOffset + firstAccessor.byteOffset;
var firstAccessorByteOffset = firstAccessor.byteOffset.GetValueOrDefault();
var start = firstView.byteOffset + firstAccessorByteOffset;
var pos = start;
foreach (var i in accessorIndices)
{
@@ -264,18 +265,25 @@ namespace UniVRM10
{
throw new ArgumentException($"accessor.type: {current.type}");
}
if (firstAccessor.componentType != current.componentType)
{
return false;
}
var view = Gltf.bufferViews[current.bufferView.Value];
if (pos != view.byteOffset + current.byteOffset)
if (firstView.buffer != view.buffer)
{
return false;
}
var begin = view.byteOffset + current.byteOffset;
var currentAccessorByteOffset = current.byteOffset.GetValueOrDefault();
if (pos != view.byteOffset + currentAccessorByteOffset)
{
return false;
}
var begin = view.byteOffset + currentAccessorByteOffset;
var byteLength = current.CalcByteSize();
pos += byteLength;
@@ -312,7 +320,7 @@ namespace UniVRM10
else
{
// IndexBufferが連続して格納されていない => Int[] を作り直す
using (var indices = new NativeArray<byte>(totalCount * Marshal.SizeOf(typeof(int)), Allocator.Persistent))
var indices = m_data.NativeArrayManager.CreateNativeArray<byte>(totalCount * Marshal.SizeOf(typeof(int)));
{
var span = indices.Reinterpret<Int32>(1);
var offset = 0;