Pārlūkot izejas kodu

comment out finish test, remove exposed render items field

Garrett Johnson 5 gadi atpakaļ
vecāks
revīzija
1f3e799691

+ 0 - 3
src/renderers/webgl/WebGLRenderLists.js

@@ -160,9 +160,6 @@ function WebGLRenderList() {
 
 
 	return {
 	return {
 
 
-		// Note: renderItems temporarily exposed to enable testing of the `finish` function.
-
-		renderItems: renderItems,
 		opaque: opaque,
 		opaque: opaque,
 		transparent: transparent,
 		transparent: transparent,
 
 

+ 64 - 65
test/unit/src/renderers/webgl/WebGLRenderLists.tests.js

@@ -297,71 +297,70 @@ export default QUnit.module( 'Renderers', () => {
 
 
 			} );
 			} );
 
 
-			QUnit.test( 'finish', ( assert ) => {
-
-				var list = new WebGLRenderList();
-				var obj = { id: 'A', renderOrder: 0 };
-				var mat = { transparent: false, program: { id: 0 } };
-				var geom = {};
-
-				assert.ok( list.renderItems.length === 0, 'Render items length defaults to 0.' );
-
-				list.push( obj, geom, mat, 0, 0, {} );
-				list.push( obj, geom, mat, 0, 0, {} );
-				list.push( obj, geom, mat, 0, 0, {} );
-				assert.ok( list.renderItems.length === 3, 'Render items length expands as items are added.' );
-
-				list.finish();
-				assert.deepEqual(
-					list.renderItems.map( item => item.object ),
-					[ obj, obj, obj ],
-					'Render items are not cleaned if they are being used.'
-				);
-				assert.deepEqual(
-					list.renderItems[ 1 ],
-					{
-						id: 'A',
-						object: obj,
-						geometry: geom,
-						material: mat,
-						program: mat.program,
-						groupOrder: 0,
-						renderOrder: 0,
-						z: 0,
-						group: {}
-					},
-					'Unused render item is structured correctly before clearing.'
-				);
-
-				list.init();
-				list.push( obj, geom, mat, 0, 0, {} );
-				assert.ok( list.renderItems.length === 3, 'Render items length does not shrink.' );
-
-				list.finish();
-				assert.deepEqual(
-					list.renderItems.map( item => item.object ),
-					[ obj, null, null ],
-					'Render items are cleaned if they are not being used.'
-				);
-
-				assert.deepEqual(
-					list.renderItems[ 1 ],
-					{
-						id: null,
-						object: null,
-						geometry: null,
-						material: null,
-						program: null,
-						groupOrder: 0,
-						renderOrder: 0,
-						z: 0,
-						group: null
-					},
-					'Unused render item is structured correctly before clearing.'
-				);
-
-
-			} );
+			// QUnit.test( 'finish', ( assert ) => {
+
+			// 	var list = new WebGLRenderList();
+			// 	var obj = { id: 'A', renderOrder: 0 };
+			// 	var mat = { transparent: false, program: { id: 0 } };
+			// 	var geom = {};
+
+			// 	assert.ok( list.renderItems.length === 0, 'Render items length defaults to 0.' );
+
+			// 	list.push( obj, geom, mat, 0, 0, {} );
+			// 	list.push( obj, geom, mat, 0, 0, {} );
+			// 	list.push( obj, geom, mat, 0, 0, {} );
+			// 	assert.ok( list.renderItems.length === 3, 'Render items length expands as items are added.' );
+
+			// 	list.finish();
+			// 	assert.deepEqual(
+			// 		list.renderItems.map( item => item.object ),
+			// 		[ obj, obj, obj ],
+			// 		'Render items are not cleaned if they are being used.'
+			// 	);
+			// 	assert.deepEqual(
+			// 		list.renderItems[ 1 ],
+			// 		{
+			// 			id: 'A',
+			// 			object: obj,
+			// 			geometry: geom,
+			// 			material: mat,
+			// 			program: mat.program,
+			// 			groupOrder: 0,
+			// 			renderOrder: 0,
+			// 			z: 0,
+			// 			group: {}
+			// 		},
+			// 		'Unused render item is structured correctly before clearing.'
+			// 	);
+
+			// 	list.init();
+			// 	list.push( obj, geom, mat, 0, 0, {} );
+			// 	assert.ok( list.renderItems.length === 3, 'Render items length does not shrink.' );
+
+			// 	list.finish();
+			// 	assert.deepEqual(
+			// 		list.renderItems.map( item => item.object ),
+			// 		[ obj, null, null ],
+			// 		'Render items are cleaned if they are not being used.'
+			// 	);
+
+			// 	assert.deepEqual(
+			// 		list.renderItems[ 1 ],
+			// 		{
+			// 			id: null,
+			// 			object: null,
+			// 			geometry: null,
+			// 			material: null,
+			// 			program: null,
+			// 			groupOrder: 0,
+			// 			renderOrder: 0,
+			// 			z: 0,
+			// 			group: null
+			// 		},
+			// 		'Unused render item is structured correctly before clearing.'
+			// 	);
+
+			// } );
 
 
 		} );
 		} );