Removed remaining addIndex(). Fixes mrdoob#7164.

mrdoob · mrdoob · commit c8e3b3b52c76 · 2015-09-15T22:14:58.000+02:00
diff --git a/src/core/BufferGeometry.js b/src/core/BufferGeometry.js
@@ -64,7 +64,7 @@ THREE.BufferGeometry.prototype = {
 		if ( name === 'index' ) {
 
 			console.warn( 'THREE.BufferGeometry.addAttribute: Use .setIndex() for index attribute.' );
-			this.addIndex( attribute );
+			this.setIndex( attribute );
 
 		}
 
@@ -505,7 +505,7 @@ THREE.BufferGeometry.prototype = {
 
 			var TypeArray = geometry.vertices.length > 65535 ? Uint32Array : Uint16Array;
 			var indices = new TypeArray( geometry.indices.length * 3 );
-			this.addIndex( new THREE.BufferAttribute( indices, 1 ).copyIndicesArray( geometry.indices ) );
+			this.setIndex( new THREE.BufferAttribute( indices, 1 ).copyIndicesArray( geometry.indices ) );
 
 		}
 
@@ -968,7 +968,7 @@ THREE.BufferGeometry.prototype = {
 
 		if ( index !== null ) {
 
-			this.addIndex( index.clone() );
+			this.setIndex( index.clone() );
 
 		}
 
diff --git a/src/core/InstancedBufferGeometry.js b/src/core/InstancedBufferGeometry.js
@@ -32,7 +32,7 @@ THREE.InstancedBufferGeometry.prototype.copy = function ( source ) {
 
 	if ( index !== null ) {
 
-		this.addIndex( index.clone() );
+		this.setIndex( index.clone() );
 
 	}
 
diff --git a/src/extras/geometries/CircleBufferGeometry.js b/src/extras/geometries/CircleBufferGeometry.js
@@ -56,7 +56,7 @@ THREE.CircleBufferGeometry = function ( radius, segments, thetaStart, thetaLengt
 
 	}
 
-	this.addIndex( new THREE.BufferAttribute( new Uint16Array( indices ), 1 ) );
+	this.setIndex( new THREE.BufferAttribute( new Uint16Array( indices ), 1 ) );
 	this.addAttribute( 'position', new THREE.BufferAttribute( positions, 3 ) );
 	this.addAttribute( 'normal', new THREE.BufferAttribute( normals, 3 ) );
 	this.addAttribute( 'uv', new THREE.BufferAttribute( uvs, 2 ) );
diff --git a/src/extras/geometries/PlaneBufferGeometry.js b/src/extras/geometries/PlaneBufferGeometry.js
@@ -85,7 +85,7 @@ THREE.PlaneBufferGeometry = function ( width, height, widthSegments, heightSegme
 
 	}
 
-	this.addIndex( new THREE.BufferAttribute( indices, 1 ) );
+	this.setIndex( new THREE.BufferAttribute( indices, 1 ) );
 	this.addAttribute( 'position', new THREE.BufferAttribute( vertices, 3 ) );
 	this.addAttribute( 'normal', new THREE.BufferAttribute( normals, 3 ) );
 	this.addAttribute( 'uv', new THREE.BufferAttribute( uvs, 2 ) );
diff --git a/src/extras/geometries/SphereBufferGeometry.js b/src/extras/geometries/SphereBufferGeometry.js
@@ -88,7 +88,7 @@ THREE.SphereBufferGeometry = function ( radius, widthSegments, heightSegments, p
 
 	}
 
-	this.addIndex( new THREE.BufferAttribute( new Uint16Array( indices ), 1 ) );
+	this.setIndex( new THREE.BufferAttribute( new Uint16Array( indices ), 1 ) );
 	this.addAttribute( 'position', positions );
 	this.addAttribute( 'normal', normals );
 	this.addAttribute( 'uv', uvs );
diff --git a/src/extras/helpers/BoxHelper.js b/src/extras/helpers/BoxHelper.js
@@ -8,7 +8,7 @@ THREE.BoxHelper = function ( object ) {
 	var positions = new Float32Array( 8 * 3 );
 
 	var geometry = new THREE.BufferGeometry();
-	geometry.addIndex( new THREE.BufferAttribute( indices, 1 ) );
+	geometry.setIndex( new THREE.BufferAttribute( indices, 1 ) );
 	geometry.addAttribute( 'position', new THREE.BufferAttribute( positions, 3 ) );
 
 	THREE.LineSegments.call( this, geometry, new THREE.LineBasicMaterial( { color: 0xffff00 } ) );
diff --git a/src/loaders/BufferGeometryLoader.js b/src/loaders/BufferGeometryLoader.js
@@ -41,7 +41,7 @@ THREE.BufferGeometryLoader.prototype = {
 		if ( index !== undefined ) {
 
 			var typedArray = new self[ index.type ]( index.array );
-			geometry.addIndex( new THREE.BufferAttribute( typedArray, 1 ) );
+			geometry.setIndex( new THREE.BufferAttribute( typedArray, 1 ) );
 
 		}
 
diff --git a/src/objects/Sprite.js b/src/objects/Sprite.js
@@ -10,7 +10,7 @@ THREE.Sprite = ( function () {
 	var uvs = new Float32Array( [ 0, 0,   1, 0,   1, 1,   0, 1 ] );
 
 	var geometry = new THREE.BufferGeometry();
-	geometry.addIndex( new THREE.BufferAttribute( indices, 1 ) );
+	geometry.setIndex( new THREE.BufferAttribute( indices, 1 ) );
 	geometry.addAttribute( 'position', new THREE.BufferAttribute( vertices, 3 ) );
 	geometry.addAttribute( 'uv', new THREE.BufferAttribute( uvs, 2 ) );
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ THREE.BufferGeometry.prototype = {`
`64`	`64`	`if ( name === 'index' ) {`
`65`	`65`
`66`	`66`	`console.warn( 'THREE.BufferGeometry.addAttribute: Use .setIndex() for index attribute.' );`
`67`		`- this.addIndex( attribute );`
	`67`	`+ this.setIndex( attribute );`
`68`	`68`
`69`	`69`	`}`
`70`	`70`
`@@ -505,7 +505,7 @@ THREE.BufferGeometry.prototype = {`
`505`	`505`
`506`	`506`	`var TypeArray = geometry.vertices.length > 65535 ? Uint32Array : Uint16Array;`
`507`	`507`	`var indices = new TypeArray( geometry.indices.length * 3 );`
`508`		`- this.addIndex( new THREE.BufferAttribute( indices, 1 ).copyIndicesArray( geometry.indices ) );`
	`508`	`+ this.setIndex( new THREE.BufferAttribute( indices, 1 ).copyIndicesArray( geometry.indices ) );`
`509`	`509`
`510`	`510`	`}`
`511`	`511`
`@@ -968,7 +968,7 @@ THREE.BufferGeometry.prototype = {`
`968`	`968`
`969`	`969`	`if ( index !== null ) {`
`970`	`970`
`971`		`- this.addIndex( index.clone() );`
	`971`	`+ this.setIndex( index.clone() );`
`972`	`972`
`973`	`973`	`}`
`974`	`974`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ THREE.InstancedBufferGeometry.prototype.copy = function ( source ) {`
`32`	`32`
`33`	`33`	`if ( index !== null ) {`
`34`	`34`
`35`		`- this.addIndex( index.clone() );`
	`35`	`+ this.setIndex( index.clone() );`
`36`	`36`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ THREE.CircleBufferGeometry = function ( radius, segments, thetaStart, thetaLengt`
`56`	`56`
`57`	`57`	`}`
`58`	`58`
`59`		`- this.addIndex( new THREE.BufferAttribute( new Uint16Array( indices ), 1 ) );`
	`59`	`+ this.setIndex( new THREE.BufferAttribute( new Uint16Array( indices ), 1 ) );`
`60`	`60`	`this.addAttribute( 'position', new THREE.BufferAttribute( positions, 3 ) );`
`61`	`61`	`this.addAttribute( 'normal', new THREE.BufferAttribute( normals, 3 ) );`
`62`	`62`	`this.addAttribute( 'uv', new THREE.BufferAttribute( uvs, 2 ) );`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ THREE.PlaneBufferGeometry = function ( width, height, widthSegments, heightSegme`
`85`	`85`
`86`	`86`	`}`
`87`	`87`
`88`		`- this.addIndex( new THREE.BufferAttribute( indices, 1 ) );`
	`88`	`+ this.setIndex( new THREE.BufferAttribute( indices, 1 ) );`
`89`	`89`	`this.addAttribute( 'position', new THREE.BufferAttribute( vertices, 3 ) );`
`90`	`90`	`this.addAttribute( 'normal', new THREE.BufferAttribute( normals, 3 ) );`
`91`	`91`	`this.addAttribute( 'uv', new THREE.BufferAttribute( uvs, 2 ) );`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ THREE.SphereBufferGeometry = function ( radius, widthSegments, heightSegments, p`
`88`	`88`
`89`	`89`	`}`
`90`	`90`
`91`		`- this.addIndex( new THREE.BufferAttribute( new Uint16Array( indices ), 1 ) );`
	`91`	`+ this.setIndex( new THREE.BufferAttribute( new Uint16Array( indices ), 1 ) );`
`92`	`92`	`this.addAttribute( 'position', positions );`
`93`	`93`	`this.addAttribute( 'normal', normals );`
`94`	`94`	`this.addAttribute( 'uv', uvs );`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ THREE.BufferGeometryLoader.prototype = {`
`41`	`41`	`if ( index !== undefined ) {`
`42`	`42`
`43`	`43`	`var typedArray = new self[ index.type ]( index.array );`
`44`		`- geometry.addIndex( new THREE.BufferAttribute( typedArray, 1 ) );`
	`44`	`+ geometry.setIndex( new THREE.BufferAttribute( typedArray, 1 ) );`
`45`	`45`
`46`	`46`	`}`
`47`	`47`