diff --git a/Assets/VRM10/Runtime/IO/ArrayBytesBuffer.cs b/Assets/VRM10/Runtime/IO/ArrayBytesBuffer.cs index fc1dd7de6..3cf5486e3 100644 --- a/Assets/VRM10/Runtime/IO/ArrayBytesBuffer.cs +++ b/Assets/VRM10/Runtime/IO/ArrayBytesBuffer.cs @@ -43,11 +43,11 @@ namespace UniVRM10 backup.CopyTo(m_bytes, backup.Length); } - public void Extend(ArraySegment array, int stride, out int offset, out int length) + public void Extend(ArraySegment array, out int offset, out int length) { var tmp = m_bytes; // alignment - var padding = m_used % stride == 0 ? 0 : stride - m_used % stride; + var padding = 0; // m_used % stride == 0 ? 0 : stride - m_used % stride; if (m_bytes == null || m_used + padding + array.Count > m_bytes.Length) { diff --git a/Assets/VRM10/Runtime/IO/BufferAccessorAdapter.cs b/Assets/VRM10/Runtime/IO/BufferAccessorAdapter.cs index 39f0ae7a1..719c5b197 100644 --- a/Assets/VRM10/Runtime/IO/BufferAccessorAdapter.cs +++ b/Assets/VRM10/Runtime/IO/BufferAccessorAdapter.cs @@ -39,7 +39,7 @@ namespace UniVRM10 count = self.Count; } var slice = self.Bytes.Slice(offset * stride, count * stride); - return storage.AppendToBuffer(bufferIndex, slice, stride); + return storage.AppendToBuffer(bufferIndex, slice); } static glTFAccessor CreateGltfAccessor(this VrmLib.BufferAccessor self, @@ -116,8 +116,8 @@ namespace UniVRM10 sparseValueSpan[i] = value; } - var sparseIndexView = storage.AppendToBuffer(bufferIndex, sparseIndexBin, 4); - var sparseValueView = storage.AppendToBuffer(bufferIndex, sparseValueBin, 12); + var sparseIndexView = storage.AppendToBuffer(bufferIndex, sparseIndexBin); + var sparseValueView = storage.AppendToBuffer(bufferIndex, sparseValueBin); var accessorIndex = storage.Gltf.accessors.Count; var accessor = new glTFAccessor diff --git a/Assets/VRM10/Runtime/IO/ImageAdapter.cs b/Assets/VRM10/Runtime/IO/ImageAdapter.cs index f678237d9..d6bfda66f 100644 --- a/Assets/VRM10/Runtime/IO/ImageAdapter.cs +++ b/Assets/VRM10/Runtime/IO/ImageAdapter.cs @@ -87,7 +87,7 @@ namespace UniVRM10 public static glTFImage ToGltf(this VrmLib.Image src, Vrm10Storage storage) { - var viewIndex = storage.AppendToBuffer(0, src.Bytes, 1); + var viewIndex = storage.AppendToBuffer(0, src.Bytes); var gltf = storage.Gltf; return new glTFImage { diff --git a/Assets/VRM10/Runtime/IO/Vrm10Storage.cs b/Assets/VRM10/Runtime/IO/Vrm10Storage.cs index 0880ad7d3..a3767d596 100644 --- a/Assets/VRM10/Runtime/IO/Vrm10Storage.cs +++ b/Assets/VRM10/Runtime/IO/Vrm10Storage.cs @@ -73,9 +73,9 @@ namespace UniVRM10 Buffers[0].ExtendCapacity(bytesLength); } - public int AppendToBuffer(int bufferIndex, ArraySegment segment, int stride) + public int AppendToBuffer(int bufferIndex, ArraySegment segment) { - Buffers[bufferIndex].Extend(segment, stride, out int offset, out int length); + Buffers[bufferIndex].Extend(segment, out int offset, out int length); var viewIndex = Gltf.bufferViews.Count; Gltf.bufferViews.Add(new UniGLTF.glTFBufferView {