From 64cd2eae07bbc276d986f739b6d7f7d78c5a99a8 Mon Sep 17 00:00:00 2001 From: JoshuaStorm Date: Thu, 9 Jun 2016 10:18:45 -0400 Subject: [PATCH] Avoid checking extras --- specs/lib/combinePrimitivesSpec.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/specs/lib/combinePrimitivesSpec.js b/specs/lib/combinePrimitivesSpec.js index 0dd45b95..146dde7d 100755 --- a/specs/lib/combinePrimitivesSpec.js +++ b/specs/lib/combinePrimitivesSpec.js @@ -5,6 +5,7 @@ var addPipelineExtras = require('../../lib/addPipelineExtras'); var combinePrimitives = require('../../lib/combinePrimitives'); var writeGltf = require('../../lib/writeGltf'); var loadGltfUris = require('../../lib/loadGltfUris'); +var removePipelineExtras = require('../../lib/removePipelineExtras'); var boxPath = './specs/data/combineObjects/box.gltf'; var doubleBoxToCombinePath = './specs/data/combineObjects/doubleBoxToCombine.gltf'; @@ -58,6 +59,8 @@ describe('combinePrimitives', function(){ var doubleBoxToCombine = gltf; combinePrimitives(doubleBoxToCombine); + removePipelineExtras(doubleBoxToCombine); + expect(doubleBoxToCombine.meshes.meshTest.primitives.length).toEqual(1); expect(doubleBoxToCombine.meshes.meshTest.primitives[0].material).toEqual('Effect_outer'); expect(doubleBoxToCombine.meshes.meshTest.primitives[0].mode).toEqual(4); @@ -75,8 +78,7 @@ describe('combinePrimitives', function(){ "byteStride": 0, "componentType": 5123, "type": "SCALAR", - "count": 516, - "extras": { "_pipeline": { "deleteExtras": true } } + "count": 516 }); expect(doubleBoxToCombine.accessors['meshTest_POSITION_accessor_0']).toEqual({ @@ -87,8 +89,7 @@ describe('combinePrimitives', function(){ "type": "VEC3", "count": 320, "max": [0.5, 0.5, 0.5], - "min": [-0.5, -0.5, -0.5], - "extras": { "_pipeline": { "deleteExtras": true } } + "min": [-0.5, -0.5, -0.5] }); expect(doubleBoxToCombine.bufferViews['meshTest_INDEX_bufferView_0'].buffer).toEqual('meshTest_INDEX_buffer_0'); });