Fixed sparse accessor exporter

ousttrue · Jun 7, 2018 · e51790d · e51790d
1 parent ea5b240
commit e51790d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Core/Scripts/Extensions/glTFExtensions.cs b/Core/Scripts/Extensions/glTFExtensions.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using UnityEngine;
@@ -166,7 +167,8 @@ public static int ExtendSparseBufferAndGetAccessorIndex<T>(this glTF gltf, int b
             {
                 return -1;
             }
-            var sparseValuesViewIndex = ExtendBufferAndGetViewIndex(gltf, bufferIndex, array, target);
+            var sparseValuesViewIndex = ExtendBufferAndGetViewIndex(gltf, bufferIndex, 
+                sparseIndices.Select(x => array.Array[array.Offset+x]).ToArray(), target);
             var accessorIndex = gltf.accessors.Count;
             gltf.accessors.Add(new glTFAccessor
             {

diff --git a/Core/Scripts/IO/gltfExporter.cs b/Core/Scripts/IO/gltfExporter.cs
@@ -520,7 +520,10 @@ static gltfMorphTarget ExportMorphTarget(glTF gltf, int bufferIndex,
         {
             var blendShapeVertices = mesh.vertices;
             var blendShpaeNormals = mesh.normals;
+            var useNormal = blendShpaeNormals != null && blendShpaeNormals.Length == blendShapeVertices.Length;
             var blendShapeTangents = mesh.tangents.Select(y => (Vector3)y).ToArray();
+            var useTangent = blendShapeTangents != null && blendShapeTangents.Length == blendShapeVertices.Length;
+
             var frameCount = mesh.GetBlendShapeFrameCount(j);
             mesh.GetBlendShapeFrameVertices(j, frameCount - 1, blendShapeVertices, blendShpaeNormals, null);
             blendShapeVertices = blendShapeVertices.Select(y => y.ReverseZ()).ToArray();
@@ -532,13 +535,19 @@ static gltfMorphTarget ExportMorphTarget(glTF gltf, int bufferIndex,
                     {
                         return
                         blendShapeVertices[x] != Vector3.zero
-                        || blendShpaeNormals[x] != Vector3.zero
-                        || blendShapeTangents[x] != Vector3.zero
+                        || (useNormal && blendShpaeNormals[x] != Vector3.zero)
+                        || (useTangent && blendShapeTangents[x] != Vector3.zero)
                         ;
                     })
                     .ToArray()
                     ;
 
+                var sparseBytes = (4 + 12 + 12 + 12) * sparseIndices.Length;
+                var fullBytes = (12 + 12 + 12) * blendShapeVertices.Length;
+                Debug.LogFormat("Export sparse: {0}/{1}bytes({2}%)",
+                    sparseBytes, fullBytes, (int)((float)sparseBytes/fullBytes)
+                    );
+
                 var sparseIndicesViewIndex = gltf.ExtendBufferAndGetViewIndex(bufferIndex, sparseIndices);
 
                 var blendShapePositionAccessorIndex = gltf.ExtendSparseBufferAndGetAccessorIndex(bufferIndex,