Merge pull request #18036 from Mugen87/dev39

BufferGeometryUtils: convertToTriangles() -> toTrianglesDrawMode().

docs/examples/en/utils/BufferGeometryUtils.html

@@ -73,7 +73,7 @@
 
 		</p>
 
-		<h3>[method:BufferGeometry convertToTriangles]( [param:BufferGeometry geometry], [param:TrianglesDrawMode drawMode] )</h3>
+		<h3>[method:BufferGeometry toTrianglesDrawMode]( [param:BufferGeometry geometry], [param:TrianglesDrawMode drawMode] )</h3>
 		<p>
 		geometry -- Instance of [page:BufferGeometry BufferGeometry].<br />
 		drawMode -- The draw mode of the given geometry.<br /><br />

docs/examples/zh/utils/BufferGeometryUtils.html

@@ -73,7 +73,7 @@
 
 		</p>
 
-		<h3>[method:BufferGeometry convertToTriangles]( [param:BufferGeometry geometry], [param:TrianglesDrawMode drawMode] )</h3>
+		<h3>[method:BufferGeometry toTrianglesDrawMode]( [param:BufferGeometry geometry], [param:TrianglesDrawMode drawMode] )</h3>
 		<p>
 		geometry -- Instance of [page:BufferGeometry BufferGeometry].<br />
 		drawMode -- The draw mode of the given geometry.<br /><br />

examples/js/utils/BufferGeometryUtils.js

@@ -629,11 +629,11 @@ THREE.BufferGeometryUtils = {
 	 * @param {number} drawMode
 	 * @return {THREE.BufferGeometry>}
 	 */
-	convertToTriangles: function ( geometry, drawMode ) {
+	toTrianglesDrawMode: function ( geometry, drawMode ) {
 
 		if ( drawMode === THREE.TrianglesDrawMode ) {
 
-			console.warn( 'THREE.BufferGeometryUtils.convertToTriangles(): Geometry already defined as triangles.' );
+			console.warn( 'THREE.BufferGeometryUtils.toTrianglesDrawMode(): Geometry already defined as triangles.' );
 			return geometry;
 
 		}
@@ -663,7 +663,7 @@ THREE.BufferGeometryUtils = {
 
 				} else {
 
-					console.error( 'THREE.BufferGeometryUtils.convertToTriangles(): Undefined position attribute. Unable to perform conversion.' );
+					console.error( 'THREE.BufferGeometryUtils.toTrianglesDrawMode(): Undefined position attribute. Processing not possible.' );
 					return geometry;
 
 				}
@@ -714,7 +714,7 @@ THREE.BufferGeometryUtils = {
 
 			if ( ( newIndices.length / 3 ) !== numberOfTriangles ) {
 
-				console.error( 'THREE.BufferGeometryUtils.convertToTriangles(): Unable to generate correct amount of triangles.' );
+				console.error( 'THREE.BufferGeometryUtils.toTrianglesDrawMode(): Unable to generate correct amount of triangles.' );
 
 			}
 
@@ -728,7 +728,7 @@ THREE.BufferGeometryUtils = {
 
 		} else {
 
-			console.error( 'THREE.BufferGeometryUtils.convertToTriangles(): Unknown draw mode:', drawMode );
+			console.error( 'THREE.BufferGeometryUtils.toTrianglesDrawMode(): Unknown draw mode:', drawMode );
 			return geometry;
 
 		}

examples/jsm/utils/BufferGeometryUtils.d.ts

@@ -7,5 +7,5 @@ export namespace BufferGeometryUtils {
 	export function interleaveAttributes( attributes: BufferAttribute[] ): InterleavedBufferAttribute;
 	export function estimateBytesUsed( geometry: BufferGeometry ): number;
 	export function mergeVertices( geometry: BufferGeometry, tolerance?: number ): BufferGeometry;
-	export function convertToTriangles( geometry: BufferGeometry, drawMode: TrianglesDrawModes ): BufferGeometry;
+	export function toTrianglesDrawMode( geometry: BufferGeometry, drawMode: TrianglesDrawModes ): BufferGeometry;
 }

examples/jsm/utils/BufferGeometryUtils.js

@@ -641,11 +641,11 @@ var BufferGeometryUtils = {
 	 * @param {number} drawMode
 	 * @return {BufferGeometry>}
 	 */
-	convertToTriangles: function ( geometry, drawMode ) {
+	toTrianglesDrawMode: function ( geometry, drawMode ) {
 
 		if ( drawMode === TrianglesDrawMode ) {
 
-			console.warn( 'THREE.BufferGeometryUtils.convertToTriangles(): Geometry already defined as triangles.' );
+			console.warn( 'THREE.BufferGeometryUtils.toTrianglesDrawMode(): Geometry already defined as triangles.' );
 			return geometry;
 
 		}
@@ -675,7 +675,7 @@ var BufferGeometryUtils = {
 
 				} else {
 
-					console.error( 'THREE.BufferGeometryUtils.convertToTriangles(): Undefined position attribute. Unable to perform conversion.' );
+					console.error( 'THREE.BufferGeometryUtils.toTrianglesDrawMode(): Undefined position attribute. Processing not possible.' );
 					return geometry;
 
 				}
@@ -726,7 +726,7 @@ var BufferGeometryUtils = {
 
 			if ( ( newIndices.length / 3 ) !== numberOfTriangles ) {
 
-				console.error( 'THREE.BufferGeometryUtils.convertToTriangles(): Unable to generate correct amount of triangles.' );
+				console.error( 'THREE.BufferGeometryUtils.toTrianglesDrawMode(): Unable to generate correct amount of triangles.' );
 
 			}
 
@@ -740,7 +740,7 @@ var BufferGeometryUtils = {
 
 		} else {
 
-			console.error( 'THREE.BufferGeometryUtils.convertToTriangles(): Unknown draw mode:', drawMode );
+			console.error( 'THREE.BufferGeometryUtils.toTrianglesDrawMode(): Unknown draw mode:', drawMode );
 			return geometry;
 
 		}

test/unit/example/utils/BufferGeometryUtils.tests.js

@@ -130,7 +130,7 @@ export default QUnit.module( 'BufferGeometryUtils', () => {
 
 	} );
 
-	QUnit.test( 'convertToTriangles()', ( assert ) => {
+	QUnit.test( 'toTrianglesDrawMode()', ( assert ) => {
 
 		// TRIANGLE_STRIP
 
@@ -146,7 +146,7 @@ export default QUnit.module( 'BufferGeometryUtils', () => {
 		var geometry1 = new BufferGeometry();
 
 		geometry1.setAttribute( 'position', new BufferAttribute( new Float32Array( vertices1 ), 3 ) );
-		geometry1 = BufferGeometryUtils.convertToTriangles( geometry1, TriangleStripDrawMode );
+		geometry1 = BufferGeometryUtils.toTrianglesDrawMode( geometry1, TriangleStripDrawMode );
 
 		assert.deepEqual( geometry1.index.array, new Uint16Array( [ 0, 1, 2, 3, 2, 1, 2, 3, 4, 5, 4, 3 ] ), 'correct triangle indices from triangle strip' );
 
@@ -164,7 +164,7 @@ export default QUnit.module( 'BufferGeometryUtils', () => {
 		var geometry2 = new BufferGeometry();
 
 		geometry2.setAttribute( 'position', new BufferAttribute( new Float32Array( vertices2 ), 3 ) );
-		geometry2 = BufferGeometryUtils.convertToTriangles( geometry2, TriangleFanDrawMode );
+		geometry2 = BufferGeometryUtils.toTrianglesDrawMode( geometry2, TriangleFanDrawMode );
 
 		assert.deepEqual( geometry2.index.array, new Uint16Array( [ 0, 1, 2, 0, 2, 3, 0, 3, 4, 0, 4, 5 ] ), 'correct triangle indices from triangle fan' );