commit b6561d9d3434021bb7f0a3c9d125a1308d65b0f0
author John McCutchan <john@johnmccutchan.com> Tue Mar 27 08:24:38 2018 -0700
committer GitHub <noreply@github.com> Tue Mar 27 08:24:38 2018 -0700
tree 7be1d6ffd7a1f3f07333f8775137b59b21dbe6b0
parent 88218c47b12c9ea50976ef2eabf66c5e32d2350e
parent 10fcd158cbb9cfa2364bce43c99aaaa109ab4009

Merge pull request #188 from SebastianPFernandez/combine-index-bug-patch

Fixed indexing bug in MeshGeometry.combine

lib/src/vector_math_geometry/mesh_geometry.dart

diff --git a/lib/src/vector_math_geometry/mesh_geometry.dart b/lib/src/vector_math_geometry/mesh_geometry.dart
index 254d496..3080a9a 100644
--- a/lib/src/vector_math_geometry/mesh_geometry.dart
+++ b/lib/src/vector_math_geometry/mesh_geometry.dart
@@ -213,14 +213,16 @@
     // Copy over the buffer data:
     int bufferOffset = 0;
     int indexOffset = 0;
+    int vertexOffset = 0;
     for (int i = 0; i < meshes.length; ++i) {
       final MeshGeometry srcMesh = meshes[i];
       mesh.buffer.setAll(bufferOffset, srcMesh.buffer);
 
       if (totalIndices > 0) {
         for (int j = 0; j < srcMesh.indices.length; ++j) {
-          mesh.indices[j + indexOffset] = srcMesh.indices[j] + bufferOffset;
+          mesh.indices[j + indexOffset] = srcMesh.indices[j] + vertexOffset;
         }
+        vertexOffset += srcMesh.length;
         indexOffset += srcMesh.indices.length;
       }
 

test/geometry_test.dart

diff --git a/test/geometry_test.dart b/test/geometry_test.dart
index 15f6990..368ee3a 100644
--- a/test/geometry_test.dart
+++ b/test/geometry_test.dart
@@ -122,11 +122,25 @@
   }
 }
 
+void testCombineIndices() {
+  // Combining two meshes should generate indices that are not out of range.
+  SphereGenerator sphereGenerator = new SphereGenerator();
+
+  MeshGeometry sphere0 = sphereGenerator.createSphere(10.0,
+      latSegments: 8, lonSegments: 8);
+  MeshGeometry sphere1 = sphereGenerator.createSphere(10.0,
+      latSegments: 8, lonSegments: 8);
+
+  MeshGeometry combined = new MeshGeometry.combine([sphere0, sphere1]);
+  expect(combined.indices, everyElement(lessThan(combined.length)));  
+}
+
 void main() {
   group('Geometry', () {
     group('Generators', () {
       test('normal generation', testGenerateNormals);
       test('tangent generation', testGenerateTangents);
+      test('geometry combination', testCombineIndices);
     });
     group('Filters', () {
       test('transform filter', testTransformFilter);