diff --git a/Assets/VRM10/vrmlib/Runtime/BufferAccessor.cs b/Assets/VRM10/vrmlib/Runtime/BufferAccessor.cs index b37fd8ac3..f85e8553d 100644 --- a/Assets/VRM10/vrmlib/Runtime/BufferAccessor.cs +++ b/Assets/VRM10/vrmlib/Runtime/BufferAccessor.cs @@ -66,7 +66,7 @@ namespace VrmLib switch (t) { case AccessorValueType.BYTE: return 1; - case AccessorValueType.UNSIGNED_BYTE: return 4; + case AccessorValueType.UNSIGNED_BYTE: return 1; case AccessorValueType.SHORT: return 2; case AccessorValueType.UNSIGNED_SHORT: return 2; case AccessorValueType.UNSIGNED_INT: return 4; @@ -111,11 +111,31 @@ namespace VrmLib /// public unsafe NativeArray AsNativeArray(Allocator allocator) where T : struct { - fixed (byte* byteArray = Bytes.Array) + if (Stride == Marshal.SizeOf(typeof(T))) { - var nativeArray = new NativeArray(Bytes.Count / Marshal.SizeOf(), allocator); - UnsafeUtility.MemCpy(nativeArray.GetUnsafePtr(), byteArray + Bytes.Offset, Bytes.Count); - return nativeArray; + fixed (byte* byteArray = Bytes.Array) + { + var nativeArray = new NativeArray(Bytes.Count / Marshal.SizeOf(), allocator); + UnsafeUtility.MemCpy(nativeArray.GetUnsafePtr(), byteArray + Bytes.Offset, Bytes.Count); + return nativeArray; + } + } + else + { + if (typeof(T) == typeof(SkinJoints) && Stride == 4) + { + // 例えば SkinJoints を使う JOINTS_0 は UNSIGNED_BYTE と UNSIGNED_SHORT の2種類がありえる。 + fixed (UShort4* p = GetAsUShort4()) + { + var nativeArray = new NativeArray(Count, allocator); + UnsafeUtility.MemCpy(nativeArray.GetUnsafePtr(), p, Bytes.Count); + return nativeArray; + } + } + else + { + throw new Exception($"Stride:{Stride}!= sizeof({typeof(T).Name}:{Marshal.SizeOf(typeof(T))}"); + } } }