From 9bf6f45efc2f500532f1945618ddc95e2d2e5e03 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Thu, 13 Jan 2022 19:26:08 +0900 Subject: [PATCH] fix UNSIGNED_BYTE size --- Assets/VRM10/vrmlib/Runtime/BufferAccessor.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Assets/VRM10/vrmlib/Runtime/BufferAccessor.cs b/Assets/VRM10/vrmlib/Runtime/BufferAccessor.cs index b37fd8ac3..47a4ed3d1 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,18 @@ 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 + { + throw new Exception($"Stride:{Stride}!= sizeof({typeof(T).Name}:{Marshal.SizeOf(typeof(T))}"); } }