From 18ef4c6609ecb2d77e60c0609a1f54ff31471e42 Mon Sep 17 00:00:00 2001
From: ousttrue <ousttrue@gmail.com>
Date: Tue, 19 Jul 2022 18:58:14 +0900
Subject: [PATCH] =?UTF-8?q?-1=20=E3=82=92=20index=20=E3=81=AE=E7=84=A1?=
 =?UTF-8?q?=E5=8A=B9=E5=80=A4=E3=81=AB=E4=BD=BF=E3=81=A3=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=AE=E5=AF=BE=E7=AD=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Runtime/Extensions/IndexExtensions.cs     | 19 +++++++++++++++++++
 .../Extensions/IndexExtensions.cs.meta        | 11 +++++++++++
 .../Runtime/UniGLTF/IO/BufferAccessor.cs      |  1 -
 Assets/UniGLTF/Runtime/UniGLTF/IO/GltfData.cs |  4 ++--
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 Assets/UniGLTF/Runtime/Extensions/IndexExtensions.cs
 create mode 100644 Assets/UniGLTF/Runtime/Extensions/IndexExtensions.cs.meta

diff --git a/Assets/UniGLTF/Runtime/Extensions/IndexExtensions.cs b/Assets/UniGLTF/Runtime/Extensions/IndexExtensions.cs
new file mode 100644
index 000000000..7599e5b95
--- /dev/null
+++ b/Assets/UniGLTF/Runtime/Extensions/IndexExtensions.cs
@@ -0,0 +1,19 @@
+namespace UniGLTF
+{
+    public static class IndexExtensions
+    {
+        public static bool HasValidIndex(this int? self)
+        {
+            if (!self.HasValue)
+            {
+                return false;
+            }
+            if (self.Value < 0)
+            {
+                // 古いモデルで index の無効値に -1 を使っている場合がある
+                return false;
+            }
+            return true;
+        }
+    }
+}
diff --git a/Assets/UniGLTF/Runtime/Extensions/IndexExtensions.cs.meta b/Assets/UniGLTF/Runtime/Extensions/IndexExtensions.cs.meta
new file mode 100644
index 000000000..c34759131
--- /dev/null
+++ b/Assets/UniGLTF/Runtime/Extensions/IndexExtensions.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e0989fbb259f59149ab310387ea69835
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/BufferAccessor.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/BufferAccessor.cs
index 6ead44a56..faf01bfe1 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/BufferAccessor.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/BufferAccessor.cs
@@ -318,7 +318,6 @@ namespace UniGLTF
                             componentType = (glComponentType)ComponentType,
                             type = AccessorType.ToString(),
                             count = Count,
-                            byteOffset = -1,
                             sparse = new glTFSparse
                             {
                                 count = sparseValuesWithIndex.Count,
diff --git a/Assets/UniGLTF/Runtime/UniGLTF/IO/GltfData.cs b/Assets/UniGLTF/Runtime/UniGLTF/IO/GltfData.cs
index 6e4feffe4..2a37c94b7 100644
--- a/Assets/UniGLTF/Runtime/UniGLTF/IO/GltfData.cs
+++ b/Assets/UniGLTF/Runtime/UniGLTF/IO/GltfData.cs
@@ -218,7 +218,7 @@ namespace UniGLTF
 
             if (vertexAccessor.count <= 0) return NativeArrayManager.CreateNativeArray<T>(0);
 
-            var result = (vertexAccessor.bufferView.HasValue)
+            var result = (vertexAccessor.bufferView.HasValidIndex())
                 ? GetTypedFromAccessor<T>(vertexAccessor, GLTF.bufferViews[vertexAccessor.bufferView.Value])
                 : NativeArrayManager.CreateNativeArray<T>(vertexAccessor.count)
                 ;
@@ -277,7 +277,7 @@ namespace UniGLTF
             var bufferCount = vertexAccessor.count * vertexAccessor.TypeCount;
 
             NativeArray<float> result = default;
-            if (vertexAccessor.bufferView.HasValue)
+            if (vertexAccessor.bufferView.HasValidIndex())
             {
                 var view = GLTF.bufferViews[vertexAccessor.bufferView.Value];
                 var segment = GetBytesFromBuffer(view.buffer);