Exampels: Refactor usage of geometry generators.

examples/css2d_label.html

@@ -53,7 +53,7 @@
 
 				//
 
-				const earthGeometry = new THREE.SphereBufferGeometry( EARTH_RADIUS, 16, 16 );
+				const earthGeometry = new THREE.SphereGeometry( EARTH_RADIUS, 16, 16 );
 				const earthMaterial = new THREE.MeshPhongMaterial( {
 					specular: 0x333333,
 					shininess: 5,
@@ -65,7 +65,7 @@
 				const earth = new THREE.Mesh( earthGeometry, earthMaterial );
 				scene.add( earth );
 
-				const moonGeometry = new THREE.SphereBufferGeometry( MOON_RADIUS, 16, 16 );
+				const moonGeometry = new THREE.SphereGeometry( MOON_RADIUS, 16, 16 );
 				const moonMaterial = new THREE.MeshPhongMaterial( {
 					shininess: 5,
 					map: textureLoader.load( 'textures/planets/moon_1024.jpg' )

examples/css3d_orthographic.html

@@ -109,7 +109,7 @@
 					object.rotation.copy( rot );
 					scene2.add( object );
 
-					const geometry = new THREE.PlaneBufferGeometry( width, height );
+					const geometry = new THREE.PlaneGeometry( width, height );
 					const mesh = new THREE.Mesh( geometry, material );
 					mesh.position.copy( object.position );
 					mesh.rotation.copy( object.rotation );

examples/css3d_sandbox.html

@@ -65,7 +65,7 @@
 					object.scale.y = Math.random() + 0.5;
 					scene2.add( object );
 
-					const geometry = new THREE.PlaneBufferGeometry( 100, 100 );
+					const geometry = new THREE.PlaneGeometry( 100, 100 );
 					const mesh = new THREE.Mesh( geometry, material );
 					mesh.position.copy( object.position );
 					mesh.rotation.copy( object.rotation );

examples/games_fps.html

@@ -77,7 +77,7 @@
 			const NUM_SPHERES = 20;
 			const SPHERE_RADIUS = 0.2;
 
-			const sphereGeometry = new THREE.SphereBufferGeometry( SPHERE_RADIUS, 32, 32 );
+			const sphereGeometry = new THREE.SphereGeometry( SPHERE_RADIUS, 32, 32 );
 			const sphereMaterial = new THREE.MeshStandardMaterial( { color: 0x888855, roughness: 0.8, metalness: 0.5 } );
 
 			const spheres = [];

examples/js/animation/CCDIKSolver.js

@@ -257,7 +257,7 @@ THREE.CCDIKSolver = ( function () {
 		this.matrix.copy( mesh.matrixWorld );
 		this.matrixAutoUpdate = false;
 
-		this.sphereGeometry = new THREE.SphereBufferGeometry( 0.25, 16, 8 );
+		this.sphereGeometry = new THREE.SphereGeometry( 0.25, 16, 8 );
 
 		this.targetSphereMaterial = new THREE.MeshBasicMaterial( {
 			color: new THREE.Color( 0xff8888 ),

examples/js/animation/MMDPhysics.js

@@ -1358,10 +1358,10 @@ THREE.MMDPhysics = ( function () {
 				switch ( param.shapeType ) {
 
 					case 0:
-						return new THREE.SphereBufferGeometry( param.width, 16, 8 );
+						return new THREE.SphereGeometry( param.width, 16, 8 );
 
 					case 1:
-						return new THREE.BoxBufferGeometry( param.width * 2, param.height * 2, param.depth * 2, 8, 8, 8 );
+						return new THREE.BoxGeometry( param.width * 2, param.height * 2, param.depth * 2, 8, 8, 8 );
 
 					case 2:
 						return new createCapsuleGeometry( param.width, param.height, 16, 8 );
@@ -1376,9 +1376,9 @@ THREE.MMDPhysics = ( function () {
 			// copy from http://www20.atpages.jp/katwat/three.js_r58/examples/mytest37/mytest37.js?ver=20160815
 			function createCapsuleGeometry( radius, cylinderHeight, segmentsRadius, segmentsHeight ) {
 
-				var geometry = new THREE.CylinderBufferGeometry( radius, radius, cylinderHeight, segmentsRadius, segmentsHeight, true );
-				var upperSphere = new THREE.Mesh( new THREE.SphereBufferGeometry( radius, segmentsRadius, segmentsHeight, 0, Math.PI * 2, 0, Math.PI / 2 ) );
-				var lowerSphere = new THREE.Mesh( new THREE.SphereBufferGeometry( radius, segmentsRadius, segmentsHeight, 0, Math.PI * 2, Math.PI / 2, Math.PI / 2 ) );
+				var geometry = new THREE.CylinderGeometry( radius, radius, cylinderHeight, segmentsRadius, segmentsHeight, true );
+				var upperSphere = new THREE.Mesh( new THREE.SphereGeometry( radius, segmentsRadius, segmentsHeight, 0, Math.PI * 2, 0, Math.PI / 2 ) );
+				var lowerSphere = new THREE.Mesh( new THREE.SphereGeometry( radius, segmentsRadius, segmentsHeight, 0, Math.PI * 2, Math.PI / 2, Math.PI / 2 ) );
 
 				upperSphere.position.set( 0, cylinderHeight / 2, 0 );
 				lowerSphere.position.set( 0, - cylinderHeight / 2, 0 );

examples/js/cameras/CinematicCamera.js

@@ -158,7 +158,7 @@ THREE.CinematicCamera.prototype.initPostProcessing = function () {
 			}
 		} );
 
-		this.postprocessing.quad = new THREE.Mesh( new THREE.PlaneBufferGeometry( window.innerWidth, window.innerHeight ), this.postprocessing.materialBokeh );
+		this.postprocessing.quad = new THREE.Mesh( new THREE.PlaneGeometry( window.innerWidth, window.innerHeight ), this.postprocessing.materialBokeh );
 		this.postprocessing.quad.position.z = - 500;
 		this.postprocessing.scene.add( this.postprocessing.quad );
 

examples/js/controls/TransformControls.js

@@ -800,9 +800,9 @@ THREE.TransformControlsGizmo = function () {
 
 	// reusable geometry
 
-	var arrowGeometry = new THREE.CylinderBufferGeometry( 0, 0.05, 0.2, 12, 1, false );
+	var arrowGeometry = new THREE.CylinderGeometry( 0, 0.05, 0.2, 12, 1, false );
 
-	var scaleHandleGeometry = new THREE.BoxBufferGeometry( 0.125, 0.125, 0.125 );
+	var scaleHandleGeometry = new THREE.BoxGeometry( 0.125, 0.125, 0.125 );
 
 	var lineGeometry = new THREE.BufferGeometry();
 	lineGeometry.setAttribute( 'position', new THREE.Float32BufferAttribute( [ 0, 0, 0,	1, 0, 0 ], 3 ) );
@@ -855,20 +855,20 @@ THREE.TransformControlsGizmo = function () {
 			[ new THREE.Line( lineGeometry, matLineBlue ), null, [ 0, - Math.PI / 2, 0 ]]
 		],
 		XYZ: [
-			[ new THREE.Mesh( new THREE.OctahedronBufferGeometry( 0.1, 0 ), matWhiteTransparent.clone() ), [ 0, 0, 0 ], [ 0, 0, 0 ]]
+			[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.1, 0 ), matWhiteTransparent.clone() ), [ 0, 0, 0 ], [ 0, 0, 0 ]]
 		],
 		XY: [
-			[ new THREE.Mesh( new THREE.PlaneBufferGeometry( 0.295, 0.295 ), matYellowTransparent.clone() ), [ 0.15, 0.15, 0 ]],
+			[ new THREE.Mesh( new THREE.PlaneGeometry( 0.295, 0.295 ), matYellowTransparent.clone() ), [ 0.15, 0.15, 0 ]],
 			[ new THREE.Line( lineGeometry, matLineYellow ), [ 0.18, 0.3, 0 ], null, [ 0.125, 1, 1 ]],
 			[ new THREE.Line( lineGeometry, matLineYellow ), [ 0.3, 0.18, 0 ], [ 0, 0, Math.PI / 2 ], [ 0.125, 1, 1 ]]
 		],
 		YZ: [
-			[ new THREE.Mesh( new THREE.PlaneBufferGeometry( 0.295, 0.295 ), matCyanTransparent.clone() ), [ 0, 0.15, 0.15 ], [ 0, Math.PI / 2, 0 ]],
+			[ new THREE.Mesh( new THREE.PlaneGeometry( 0.295, 0.295 ), matCyanTransparent.clone() ), [ 0, 0.15, 0.15 ], [ 0, Math.PI / 2, 0 ]],
 			[ new THREE.Line( lineGeometry, matLineCyan ), [ 0, 0.18, 0.3 ], [ 0, 0, Math.PI / 2 ], [ 0.125, 1, 1 ]],
 			[ new THREE.Line( lineGeometry, matLineCyan ), [ 0, 0.3, 0.18 ], [ 0, - Math.PI / 2, 0 ], [ 0.125, 1, 1 ]]
 		],
 		XZ: [
-			[ new THREE.Mesh( new THREE.PlaneBufferGeometry( 0.295, 0.295 ), matMagentaTransparent.clone() ), [ 0.15, 0, 0.15 ], [ - Math.PI / 2, 0, 0 ]],
+			[ new THREE.Mesh( new THREE.PlaneGeometry( 0.295, 0.295 ), matMagentaTransparent.clone() ), [ 0.15, 0, 0.15 ], [ - Math.PI / 2, 0, 0 ]],
 			[ new THREE.Line( lineGeometry, matLineMagenta ), [ 0.18, 0, 0.3 ], null, [ 0.125, 1, 1 ]],
 			[ new THREE.Line( lineGeometry, matLineMagenta ), [ 0.3, 0, 0.18 ], [ 0, - Math.PI / 2, 0 ], [ 0.125, 1, 1 ]]
 		]
@@ -876,34 +876,34 @@ THREE.TransformControlsGizmo = function () {
 
 	var pickerTranslate = {
 		X: [
-			[ new THREE.Mesh( new THREE.CylinderBufferGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0.6, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]
+			[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0.6, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]
 		],
 		Y: [
-			[ new THREE.Mesh( new THREE.CylinderBufferGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0, 0.6, 0 ]]
+			[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0, 0.6, 0 ]]
 		],
 		Z: [
-			[ new THREE.Mesh( new THREE.CylinderBufferGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0, 0, 0.6 ], [ Math.PI / 2, 0, 0 ]]
+			[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0, 0, 0.6 ], [ Math.PI / 2, 0, 0 ]]
 		],
 		XYZ: [
-			[ new THREE.Mesh( new THREE.OctahedronBufferGeometry( 0.2, 0 ), matInvisible ) ]
+			[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.2, 0 ), matInvisible ) ]
 		],
 		XY: [
-			[ new THREE.Mesh( new THREE.PlaneBufferGeometry( 0.4, 0.4 ), matInvisible ), [ 0.2, 0.2, 0 ]]
+			[ new THREE.Mesh( new THREE.PlaneGeometry( 0.4, 0.4 ), matInvisible ), [ 0.2, 0.2, 0 ]]
 		],
 		YZ: [
-			[ new THREE.Mesh( new THREE.PlaneBufferGeometry( 0.4, 0.4 ), matInvisible ), [ 0, 0.2, 0.2 ], [ 0, Math.PI / 2, 0 ]]
+			[ new THREE.Mesh( new THREE.PlaneGeometry( 0.4, 0.4 ), matInvisible ), [ 0, 0.2, 0.2 ], [ 0, Math.PI / 2, 0 ]]
 		],
 		XZ: [
-			[ new THREE.Mesh( new THREE.PlaneBufferGeometry( 0.4, 0.4 ), matInvisible ), [ 0.2, 0, 0.2 ], [ - Math.PI / 2, 0, 0 ]]
+			[ new THREE.Mesh( new THREE.PlaneGeometry( 0.4, 0.4 ), matInvisible ), [ 0.2, 0, 0.2 ], [ - Math.PI / 2, 0, 0 ]]
 		]
 	};
 
 	var helperTranslate = {
 		START: [
-			[ new THREE.Mesh( new THREE.OctahedronBufferGeometry( 0.01, 2 ), matHelper ), null, null, null, 'helper' ]
+			[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.01, 2 ), matHelper ), null, null, null, 'helper' ]
 		],
 		END: [
-			[ new THREE.Mesh( new THREE.OctahedronBufferGeometry( 0.01, 2 ), matHelper ), null, null, null, 'helper' ]
+			[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.01, 2 ), matHelper ), null, null, null, 'helper' ]
 		],
 		DELTA: [
 			[ new THREE.Line( TranslateHelperGeometry(), matHelper ), null, null, null, 'helper' ]
@@ -922,22 +922,22 @@ THREE.TransformControlsGizmo = function () {
 	var gizmoRotate = {
 		X: [
 			[ new THREE.Line( CircleGeometry( 1, 0.5 ), matLineRed ) ],
-			[ new THREE.Mesh( new THREE.OctahedronBufferGeometry( 0.04, 0 ), matRed ), [ 0, 0, 0.99 ], null, [ 1, 3, 1 ]],
+			[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.04, 0 ), matRed ), [ 0, 0, 0.99 ], null, [ 1, 3, 1 ]],
 		],
 		Y: [
 			[ new THREE.Line( CircleGeometry( 1, 0.5 ), matLineGreen ), null, [ 0, 0, - Math.PI / 2 ]],
-			[ new THREE.Mesh( new THREE.OctahedronBufferGeometry( 0.04, 0 ), matGreen ), [ 0, 0, 0.99 ], null, [ 3, 1, 1 ]],
+			[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.04, 0 ), matGreen ), [ 0, 0, 0.99 ], null, [ 3, 1, 1 ]],
 		],
 		Z: [
 			[ new THREE.Line( CircleGeometry( 1, 0.5 ), matLineBlue ), null, [ 0, Math.PI / 2, 0 ]],
-			[ new THREE.Mesh( new THREE.OctahedronBufferGeometry( 0.04, 0 ), matBlue ), [ 0.99, 0, 0 ], null, [ 1, 3, 1 ]],
+			[ new THREE.Mesh( new THREE.OctahedronGeometry( 0.04, 0 ), matBlue ), [ 0.99, 0, 0 ], null, [ 1, 3, 1 ]],
 		],
 		E: [
 			[ new THREE.Line( CircleGeometry( 1.25, 1 ), matLineYellowTransparent ), null, [ 0, Math.PI / 2, 0 ]],
-			[ new THREE.Mesh( new THREE.CylinderBufferGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 1.17, 0, 0 ], [ 0, 0, - Math.PI / 2 ], [ 1, 1, 0.001 ]],
-			[ new THREE.Mesh( new THREE.CylinderBufferGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ - 1.17, 0, 0 ], [ 0, 0, Math.PI / 2 ], [ 1, 1, 0.001 ]],
-			[ new THREE.Mesh( new THREE.CylinderBufferGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 0, - 1.17, 0 ], [ Math.PI, 0, 0 ], [ 1, 1, 0.001 ]],
-			[ new THREE.Mesh( new THREE.CylinderBufferGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 0, 1.17, 0 ], [ 0, 0, 0 ], [ 1, 1, 0.001 ]],
+			[ new THREE.Mesh( new THREE.CylinderGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 1.17, 0, 0 ], [ 0, 0, - Math.PI / 2 ], [ 1, 1, 0.001 ]],
+			[ new THREE.Mesh( new THREE.CylinderGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ - 1.17, 0, 0 ], [ 0, 0, Math.PI / 2 ], [ 1, 1, 0.001 ]],
+			[ new THREE.Mesh( new THREE.CylinderGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 0, - 1.17, 0 ], [ Math.PI, 0, 0 ], [ 1, 1, 0.001 ]],
+			[ new THREE.Mesh( new THREE.CylinderGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 0, 1.17, 0 ], [ 0, 0, 0 ], [ 1, 1, 0.001 ]],
 		],
 		XYZE: [
 			[ new THREE.Line( CircleGeometry( 1, 1 ), matLineGray ), null, [ 0, Math.PI / 2, 0 ]]
@@ -952,19 +952,19 @@ THREE.TransformControlsGizmo = function () {
 
 	var pickerRotate = {
 		X: [
-			[ new THREE.Mesh( new THREE.TorusBufferGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ 0, - Math.PI / 2, - Math.PI / 2 ]],
+			[ new THREE.Mesh( new THREE.TorusGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ 0, - Math.PI / 2, - Math.PI / 2 ]],
 		],
 		Y: [
-			[ new THREE.Mesh( new THREE.TorusBufferGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ Math.PI / 2, 0, 0 ]],
+			[ new THREE.Mesh( new THREE.TorusGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ Math.PI / 2, 0, 0 ]],
 		],
 		Z: [
-			[ new THREE.Mesh( new THREE.TorusBufferGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ 0, 0, - Math.PI / 2 ]],
+			[ new THREE.Mesh( new THREE.TorusGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ 0, 0, - Math.PI / 2 ]],
 		],
 		E: [
-			[ new THREE.Mesh( new THREE.TorusBufferGeometry( 1.25, 0.1, 2, 24 ), matInvisible ) ]
+			[ new THREE.Mesh( new THREE.TorusGeometry( 1.25, 0.1, 2, 24 ), matInvisible ) ]
 		],
 		XYZE: [
-			[ new THREE.Mesh( new THREE.SphereBufferGeometry( 0.7, 10, 8 ), matInvisible ) ]
+			[ new THREE.Mesh( new THREE.SphereGeometry( 0.7, 10, 8 ), matInvisible ) ]
 		]
 	};
 
@@ -997,25 +997,25 @@ THREE.TransformControlsGizmo = function () {
 			[ new THREE.Line( lineGeometry, matLineMagenta ), [ 0.98, 0, 0.855 ], [ 0, - Math.PI / 2, 0 ], [ 0.125, 1, 1 ]]
 		],
 		XYZX: [
-			[ new THREE.Mesh( new THREE.BoxBufferGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 1.1, 0, 0 ]],
+			[ new THREE.Mesh( new THREE.BoxGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 1.1, 0, 0 ]],
 		],
 		XYZY: [
-			[ new THREE.Mesh( new THREE.BoxBufferGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 0, 1.1, 0 ]],
+			[ new THREE.Mesh( new THREE.BoxGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 0, 1.1, 0 ]],
 		],
 		XYZZ: [
-			[ new THREE.Mesh( new THREE.BoxBufferGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 0, 0, 1.1 ]],
+			[ new THREE.Mesh( new THREE.BoxGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 0, 0, 1.1 ]],
 		]
 	};
 
 	var pickerScale = {
 		X: [
-			[ new THREE.Mesh( new THREE.CylinderBufferGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0.5, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]
+			[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0.5, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]
 		],
 		Y: [
-			[ new THREE.Mesh( new THREE.CylinderBufferGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0, 0.5, 0 ]]
+			[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0, 0.5, 0 ]]
 		],
 		Z: [
-			[ new THREE.Mesh( new THREE.CylinderBufferGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0, 0, 0.5 ], [ Math.PI / 2, 0, 0 ]]
+			[ new THREE.Mesh( new THREE.CylinderGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0, 0, 0.5 ], [ Math.PI / 2, 0, 0 ]]
 		],
 		XY: [
 			[ new THREE.Mesh( scaleHandleGeometry, matInvisible ), [ 0.85, 0.85, 0 ], null, [ 3, 3, 0.2 ]],
@@ -1027,13 +1027,13 @@ THREE.TransformControlsGizmo = function () {
 			[ new THREE.Mesh( scaleHandleGeometry, matInvisible ), [ 0.85, 0, 0.85 ], null, [ 3, 0.2, 3 ]],
 		],
 		XYZX: [
-			[ new THREE.Mesh( new THREE.BoxBufferGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 1.1, 0, 0 ]],
+			[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 1.1, 0, 0 ]],
 		],
 		XYZY: [
-			[ new THREE.Mesh( new THREE.BoxBufferGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 0, 1.1, 0 ]],
+			[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 0, 1.1, 0 ]],
 		],
 		XYZZ: [
-			[ new THREE.Mesh( new THREE.BoxBufferGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 0, 0, 1.1 ]],
+			[ new THREE.Mesh( new THREE.BoxGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 0, 0, 1.1 ]],
 		]
 	};
 
@@ -1560,7 +1560,7 @@ THREE.TransformControlsPlane = function () {
 	'use strict';
 
 	THREE.Mesh.call( this,
-		new THREE.PlaneBufferGeometry( 100000, 100000, 2, 2 ),
+		new THREE.PlaneGeometry( 100000, 100000, 2, 2 ),
 		new THREE.MeshBasicMaterial( { visible: false, wireframe: true, side: THREE.DoubleSide, transparent: true, opacity: 0.1, toneMapped: false } )
 	);
 

examples/js/effects/AnaglyphEffect.js

@@ -107,7 +107,7 @@ THREE.AnaglyphEffect = function ( renderer, width, height ) {
 
 	} );
 
-	var _mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), _material );
+	var _mesh = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), _material );
 	_scene.add( _mesh );
 
 	this.setSize = function ( width, height ) {

examples/js/effects/ParallaxBarrierEffect.js

@@ -59,7 +59,7 @@ THREE.ParallaxBarrierEffect = function ( renderer ) {
 
 	} );
 
-	var mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), _material );
+	var mesh = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), _material );
 	_scene.add( mesh );
 
 	this.setSize = function ( width, height ) {

examples/js/geometries/ParametricGeometries.js

@@ -143,7 +143,7 @@ THREE.ParametricGeometries.TubeGeometry = function ( path, segments, radius, seg
 
 };
 
-THREE.ParametricGeometries.TubeGeometry.prototype = Object.create( THREE.Geometry.prototype );
+THREE.ParametricGeometries.TubeGeometry.prototype = Object.create( THREE.BufferGeometry.prototype );
 THREE.ParametricGeometries.TubeGeometry.prototype.constructor = THREE.ParametricGeometries.TubeGeometry;
 
 
@@ -194,7 +194,7 @@ THREE.ParametricGeometries.TorusKnotGeometry = function ( radius, tube, segments
 
 };
 
-THREE.ParametricGeometries.TorusKnotGeometry.prototype = Object.create( THREE.Geometry.prototype );
+THREE.ParametricGeometries.TorusKnotGeometry.prototype = Object.create( THREE.BufferGeometry.prototype );
 THREE.ParametricGeometries.TorusKnotGeometry.prototype.constructor = THREE.ParametricGeometries.TorusKnotGeometry;
 
 
@@ -222,7 +222,7 @@ THREE.ParametricGeometries.SphereGeometry = function ( size, u, v ) {
 
 };
 
-THREE.ParametricGeometries.SphereGeometry.prototype = Object.create( THREE.Geometry.prototype );
+THREE.ParametricGeometries.SphereGeometry.prototype = Object.create( THREE.BufferGeometry.prototype );
 THREE.ParametricGeometries.SphereGeometry.prototype.constructor = THREE.ParametricGeometries.SphereGeometry;
 
 
@@ -248,5 +248,5 @@ THREE.ParametricGeometries.PlaneGeometry = function ( width, depth, segmentsWidt
 
 };
 
-THREE.ParametricGeometries.PlaneGeometry.prototype = Object.create( THREE.Geometry.prototype );
+THREE.ParametricGeometries.PlaneGeometry.prototype = Object.create( THREE.BufferGeometry.prototype );
 THREE.ParametricGeometries.PlaneGeometry.prototype.constructor = THREE.ParametricGeometries.PlaneGeometry;

examples/js/loaders/VRMLLoader.js

@@ -868,7 +868,7 @@ THREE.VRMLLoader = ( function () {
 
 				if ( skyColor ) {
 
-					var skyGeometry = new THREE.SphereBufferGeometry( radius, 32, 16 );
+					var skyGeometry = new THREE.SphereGeometry( radius, 32, 16 );
 					var skyMaterial = new THREE.MeshBasicMaterial( { fog: false, side: THREE.BackSide, depthWrite: false, depthTest: false } );
 
 					if ( skyColor.length > 3 ) {
@@ -893,7 +893,7 @@ THREE.VRMLLoader = ( function () {
 
 					if ( groundColor.length > 0 ) {
 
-						var groundGeometry = new THREE.SphereBufferGeometry( radius, 32, 16, 0, 2 * Math.PI, 0.5 * Math.PI, 1.5 * Math.PI );
+						var groundGeometry = new THREE.SphereGeometry( radius, 32, 16, 0, 2 * Math.PI, 0.5 * Math.PI, 1.5 * Math.PI );
 						var groundMaterial = new THREE.MeshBasicMaterial( { fog: false, side: THREE.BackSide, vertexColors: true, depthWrite: false, depthTest: false } );
 
 						paintFaces( groundGeometry, radius, groundAngle, toColorArray( groundColor ), false );
@@ -1974,7 +1974,7 @@ THREE.VRMLLoader = ( function () {
 
 				}
 
-				var geometry = new THREE.BoxBufferGeometry( size.x, size.y, size.z );
+				var geometry = new THREE.BoxGeometry( size.x, size.y, size.z );
 
 				return geometry;
 
@@ -2018,7 +2018,7 @@ THREE.VRMLLoader = ( function () {
 
 				}
 
-				var geometry = new THREE.ConeBufferGeometry( radius, height, 16, 1, openEnded );
+				var geometry = new THREE.ConeGeometry( radius, height, 16, 1, openEnded );
 
 				return geometry;
 
@@ -2066,7 +2066,7 @@ THREE.VRMLLoader = ( function () {
 
 				}
 
-				var geometry = new THREE.CylinderBufferGeometry( radius, radius, height, 16, 1 );
+				var geometry = new THREE.CylinderGeometry( radius, radius, height, 16, 1 );
 
 				return geometry;
 
@@ -2098,7 +2098,7 @@ THREE.VRMLLoader = ( function () {
 
 				}
 
-				var geometry = new THREE.SphereBufferGeometry( radius, 16, 16 );
+				var geometry = new THREE.SphereGeometry( radius, 16, 16 );
 
 				return geometry;
 

examples/js/misc/ConvexObjectBreaker.js

@@ -16,7 +16,7 @@
  *  - Vertex normals must be planar (not smoothed)
  *
  *  - The geometry must be convex (this is not checked in the library). You can create convex
- *  geometries with THREE.ConvexGeometry. The BoxBufferGeometry, SphereBufferGeometry and other convex primitives
+ *  geometries with THREE.ConvexGeometry. The BoxGeometry, SphereGeometry and other convex primitives
  *  can also be used.
  *
  * Note: This lib adds member variables to object's userData member (see prepareBreakableObject function)

examples/js/misc/GPUComputationRenderer.js

@@ -114,7 +114,7 @@ THREE.GPUComputationRenderer = function ( sizeX, sizeY, renderer ) {
 
 	var passThruShader = createShaderMaterial( getPassThroughFragmentShader(), passThruUniforms );
 
-	var mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ), passThruShader );
+	var mesh = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ), passThruShader );
 	scene.add( mesh );
 
 

examples/js/misc/Ocean.js

@@ -188,7 +188,7 @@ THREE.Ocean = function ( renderer, camera, scene, options ) {
 	this.materialOcean.blending = 0;
 
 	// Create the simulation plane
-	this.screenQuad = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2, 2 ) );
+	this.screenQuad = new THREE.Mesh( new THREE.PlaneGeometry( 2, 2 ) );
 	this.scene.add( this.screenQuad );
 
 	// Initialise spectrum data
@@ -201,7 +201,7 @@ THREE.Ocean = function ( renderer, camera, scene, options ) {
 
 THREE.Ocean.prototype.generateMesh = function () {
 
-	var geometry = new THREE.PlaneBufferGeometry( this.geometrySize, this.geometrySize, this.geometryResolution, this.geometryResolution );
+	var geometry = new THREE.PlaneGeometry( this.geometrySize, this.geometrySize, this.geometryResolution, this.geometryResolution );
 
 	geometry.rotateX( - Math.PI / 2 );
 

examples/js/misc/VolumeSlice.js

@@ -199,7 +199,7 @@ THREE.VolumeSlice.prototype = {
 
 		if ( this.geometry ) this.geometry.dispose(); // dispose existing geometry
 
-		this.geometry = new THREE.PlaneBufferGeometry( extracted.planeWidth, extracted.planeHeight );
+		this.geometry = new THREE.PlaneGeometry( extracted.planeWidth, extracted.planeHeight );
 
 		if ( this.mesh ) {
 

examples/js/objects/Sky.js

@@ -25,7 +25,7 @@ THREE.Sky = function () {
 		depthWrite: false
 	} );
 
-	THREE.Mesh.call( this, new THREE.BoxBufferGeometry( 1, 1, 1 ), material );
+	THREE.Mesh.call( this, new THREE.BoxGeometry( 1, 1, 1 ), material );
 
 };
 

examples/js/postprocessing/CubeTexturePass.js

@@ -8,7 +8,7 @@ THREE.CubeTexturePass = function ( camera, envMap, opacity ) {
 
 	this.cubeShader = THREE.ShaderLib[ 'cube' ];
 	this.cubeMesh = new THREE.Mesh(
-		new THREE.BoxBufferGeometry( 10, 10, 10 ),
+		new THREE.BoxGeometry( 10, 10, 10 ),
 		new THREE.ShaderMaterial( {
 			uniforms: this.cubeShader.uniforms,
 			vertexShader: this.cubeShader.vertexShader,

examples/js/postprocessing/EffectComposer.js

@@ -261,7 +261,7 @@ Object.assign( THREE.Pass.prototype, {
 THREE.Pass.FullScreenQuad = ( function () {
 
 	var camera = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
-	var geometry = new THREE.PlaneBufferGeometry( 2, 2 );
+	var geometry = new THREE.PlaneGeometry( 2, 2 );
 
 	var FullScreenQuad = function ( material ) {
 

examples/js/utils/ShadowMapViewer.js

@@ -53,7 +53,7 @@ THREE.ShadowMapViewer = function ( light ) {
 		vertexShader: shader.vertexShader,
 		fragmentShader: shader.fragmentShader
 	} );
-	var plane = new THREE.PlaneBufferGeometry( frame.width, frame.height );
+	var plane = new THREE.PlaneGeometry( frame.width, frame.height );
 	var mesh = new THREE.Mesh( plane, material );
 
 	scene.add( mesh );
@@ -85,7 +85,7 @@ THREE.ShadowMapViewer = function ( light ) {
 		var labelMaterial = new THREE.MeshBasicMaterial( { map: labelTexture, side: THREE.DoubleSide } );
 		labelMaterial.transparent = true;
 
-		var labelPlane = new THREE.PlaneBufferGeometry( labelCanvas.width, labelCanvas.height );
+		var labelPlane = new THREE.PlaneGeometry( labelCanvas.width, labelCanvas.height );
 		labelMesh = new THREE.Mesh( labelPlane, labelMaterial );
 
 		scene.add( labelMesh );

examples/js/utils/UVsDebug.js

@@ -2,7 +2,7 @@
  * tool for "unwrapping" and debugging three.js geometries UV mapping
  *
  * Sample usage:
- *	document.body.appendChild( THREE.UVsDebug( new THREE.SphereBufferGeometry( 10, 10, 10, 10 ) );
+ *	document.body.appendChild( THREE.UVsDebug( new THREE.SphereGeometry( 10, 10, 10, 10 ) );
  *
  */
 

examples/jsm/animation/CCDIKSolver.js

@@ -9,7 +9,7 @@ import {
 	MeshBasicMaterial,
 	Object3D,
 	Quaternion,
-	SphereBufferGeometry,
+	SphereGeometry,
 	Vector3
 } from '../../../build/three.module.js';
 
@@ -272,7 +272,7 @@ var CCDIKSolver = ( function () {
 		this.matrix.copy( mesh.matrixWorld );
 		this.matrixAutoUpdate = false;
 
-		this.sphereGeometry = new SphereBufferGeometry( 0.25, 16, 8 );
+		this.sphereGeometry = new SphereGeometry( 0.25, 16, 8 );
 
 		this.targetSphereMaterial = new MeshBasicMaterial( {
 			color: new Color( 0xff8888 ),

examples/jsm/animation/MMDPhysics.js

@@ -1,15 +1,15 @@
 import {
 	Bone,
-	BoxBufferGeometry,
+	BoxGeometry,
 	Color,
-	CylinderBufferGeometry,
+	CylinderGeometry,
 	Euler,
 	Matrix4,
 	Mesh,
 	MeshBasicMaterial,
 	Object3D,
 	Quaternion,
-	SphereBufferGeometry,
+	SphereGeometry,
 	Vector3
 } from '../../../build/three.module.js';
 
@@ -1373,10 +1373,10 @@ var MMDPhysics = ( function () {
 				switch ( param.shapeType ) {
 
 					case 0:
-						return new SphereBufferGeometry( param.width, 16, 8 );
+						return new SphereGeometry( param.width, 16, 8 );
 
 					case 1:
-						return new BoxBufferGeometry( param.width * 2, param.height * 2, param.depth * 2, 8, 8, 8 );
+						return new BoxGeometry( param.width * 2, param.height * 2, param.depth * 2, 8, 8, 8 );
 
 					case 2:
 						return new createCapsuleGeometry( param.width, param.height, 16, 8 );
@@ -1391,9 +1391,9 @@ var MMDPhysics = ( function () {
 			// copy from http://www20.atpages.jp/katwat/three.js_r58/examples/mytest37/mytest37.js?ver=20160815
 			function createCapsuleGeometry( radius, cylinderHeight, segmentsRadius, segmentsHeight ) {
 
-				var geometry = new CylinderBufferGeometry( radius, radius, cylinderHeight, segmentsRadius, segmentsHeight, true );
-				var upperSphere = new Mesh( new SphereBufferGeometry( radius, segmentsRadius, segmentsHeight, 0, Math.PI * 2, 0, Math.PI / 2 ) );
-				var lowerSphere = new Mesh( new SphereBufferGeometry( radius, segmentsRadius, segmentsHeight, 0, Math.PI * 2, Math.PI / 2, Math.PI / 2 ) );
+				var geometry = new CylinderGeometry( radius, radius, cylinderHeight, segmentsRadius, segmentsHeight, true );
+				var upperSphere = new Mesh( new SphereGeometry( radius, segmentsRadius, segmentsHeight, 0, Math.PI * 2, 0, Math.PI / 2 ) );
+				var lowerSphere = new Mesh( new SphereGeometry( radius, segmentsRadius, segmentsHeight, 0, Math.PI * 2, Math.PI / 2, Math.PI / 2 ) );
 
 				upperSphere.position.set( 0, cylinderHeight / 2, 0 );
 				lowerSphere.position.set( 0, - cylinderHeight / 2, 0 );

examples/jsm/cameras/CinematicCamera.js

@@ -3,7 +3,7 @@ import {
 	Mesh,
 	OrthographicCamera,
 	PerspectiveCamera,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	RGBFormat,
 	Scene,
 	ShaderMaterial,
@@ -173,7 +173,7 @@ CinematicCamera.prototype.initPostProcessing = function () {
 			}
 		} );
 
-		this.postprocessing.quad = new Mesh( new PlaneBufferGeometry( window.innerWidth, window.innerHeight ), this.postprocessing.materialBokeh );
+		this.postprocessing.quad = new Mesh( new PlaneGeometry( window.innerWidth, window.innerHeight ), this.postprocessing.materialBokeh );
 		this.postprocessing.quad.position.z = - 500;
 		this.postprocessing.scene.add( this.postprocessing.quad );
 

examples/jsm/controls/TransformControls.js

@@ -1,8 +1,8 @@
 import {
-	BoxBufferGeometry,
+	BoxGeometry,
 	BufferGeometry,
 	Color,
-	CylinderBufferGeometry,
+	CylinderGeometry,
 	DoubleSide,
 	Euler,
 	Float32BufferAttribute,
@@ -12,12 +12,12 @@ import {
 	Mesh,
 	MeshBasicMaterial,
 	Object3D,
-	OctahedronBufferGeometry,
-	PlaneBufferGeometry,
+	OctahedronGeometry,
+	PlaneGeometry,
 	Quaternion,
 	Raycaster,
-	SphereBufferGeometry,
-	TorusBufferGeometry,
+	SphereGeometry,
+	TorusGeometry,
 	Vector3
 } from '../../../build/three.module.js';
 
@@ -823,9 +823,9 @@ var TransformControlsGizmo = function () {
 
 	// reusable geometry
 
-	var arrowGeometry = new CylinderBufferGeometry( 0, 0.05, 0.2, 12, 1, false );
+	var arrowGeometry = new CylinderGeometry( 0, 0.05, 0.2, 12, 1, false );
 
-	var scaleHandleGeometry = new BoxBufferGeometry( 0.125, 0.125, 0.125 );
+	var scaleHandleGeometry = new BoxGeometry( 0.125, 0.125, 0.125 );
 
 	var lineGeometry = new BufferGeometry();
 	lineGeometry.setAttribute( 'position', new Float32BufferAttribute( [ 0, 0, 0,	1, 0, 0 ], 3 ) );
@@ -878,20 +878,20 @@ var TransformControlsGizmo = function () {
 			[ new Line( lineGeometry, matLineBlue ), null, [ 0, - Math.PI / 2, 0 ]]
 		],
 		XYZ: [
-			[ new Mesh( new OctahedronBufferGeometry( 0.1, 0 ), matWhiteTransparent.clone() ), [ 0, 0, 0 ], [ 0, 0, 0 ]]
+			[ new Mesh( new OctahedronGeometry( 0.1, 0 ), matWhiteTransparent.clone() ), [ 0, 0, 0 ], [ 0, 0, 0 ]]
 		],
 		XY: [
-			[ new Mesh( new PlaneBufferGeometry( 0.295, 0.295 ), matYellowTransparent.clone() ), [ 0.15, 0.15, 0 ]],
+			[ new Mesh( new PlaneGeometry( 0.295, 0.295 ), matYellowTransparent.clone() ), [ 0.15, 0.15, 0 ]],
 			[ new Line( lineGeometry, matLineYellow ), [ 0.18, 0.3, 0 ], null, [ 0.125, 1, 1 ]],
 			[ new Line( lineGeometry, matLineYellow ), [ 0.3, 0.18, 0 ], [ 0, 0, Math.PI / 2 ], [ 0.125, 1, 1 ]]
 		],
 		YZ: [
-			[ new Mesh( new PlaneBufferGeometry( 0.295, 0.295 ), matCyanTransparent.clone() ), [ 0, 0.15, 0.15 ], [ 0, Math.PI / 2, 0 ]],
+			[ new Mesh( new PlaneGeometry( 0.295, 0.295 ), matCyanTransparent.clone() ), [ 0, 0.15, 0.15 ], [ 0, Math.PI / 2, 0 ]],
 			[ new Line( lineGeometry, matLineCyan ), [ 0, 0.18, 0.3 ], [ 0, 0, Math.PI / 2 ], [ 0.125, 1, 1 ]],
 			[ new Line( lineGeometry, matLineCyan ), [ 0, 0.3, 0.18 ], [ 0, - Math.PI / 2, 0 ], [ 0.125, 1, 1 ]]
 		],
 		XZ: [
-			[ new Mesh( new PlaneBufferGeometry( 0.295, 0.295 ), matMagentaTransparent.clone() ), [ 0.15, 0, 0.15 ], [ - Math.PI / 2, 0, 0 ]],
+			[ new Mesh( new PlaneGeometry( 0.295, 0.295 ), matMagentaTransparent.clone() ), [ 0.15, 0, 0.15 ], [ - Math.PI / 2, 0, 0 ]],
 			[ new Line( lineGeometry, matLineMagenta ), [ 0.18, 0, 0.3 ], null, [ 0.125, 1, 1 ]],
 			[ new Line( lineGeometry, matLineMagenta ), [ 0.3, 0, 0.18 ], [ 0, - Math.PI / 2, 0 ], [ 0.125, 1, 1 ]]
 		]
@@ -899,34 +899,34 @@ var TransformControlsGizmo = function () {
 
 	var pickerTranslate = {
 		X: [
-			[ new Mesh( new CylinderBufferGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0.6, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]
+			[ new Mesh( new CylinderGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0.6, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]
 		],
 		Y: [
-			[ new Mesh( new CylinderBufferGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0, 0.6, 0 ]]
+			[ new Mesh( new CylinderGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0, 0.6, 0 ]]
 		],
 		Z: [
-			[ new Mesh( new CylinderBufferGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0, 0, 0.6 ], [ Math.PI / 2, 0, 0 ]]
+			[ new Mesh( new CylinderGeometry( 0.2, 0, 1, 4, 1, false ), matInvisible ), [ 0, 0, 0.6 ], [ Math.PI / 2, 0, 0 ]]
 		],
 		XYZ: [
-			[ new Mesh( new OctahedronBufferGeometry( 0.2, 0 ), matInvisible ) ]
+			[ new Mesh( new OctahedronGeometry( 0.2, 0 ), matInvisible ) ]
 		],
 		XY: [
-			[ new Mesh( new PlaneBufferGeometry( 0.4, 0.4 ), matInvisible ), [ 0.2, 0.2, 0 ]]
+			[ new Mesh( new PlaneGeometry( 0.4, 0.4 ), matInvisible ), [ 0.2, 0.2, 0 ]]
 		],
 		YZ: [
-			[ new Mesh( new PlaneBufferGeometry( 0.4, 0.4 ), matInvisible ), [ 0, 0.2, 0.2 ], [ 0, Math.PI / 2, 0 ]]
+			[ new Mesh( new PlaneGeometry( 0.4, 0.4 ), matInvisible ), [ 0, 0.2, 0.2 ], [ 0, Math.PI / 2, 0 ]]
 		],
 		XZ: [
-			[ new Mesh( new PlaneBufferGeometry( 0.4, 0.4 ), matInvisible ), [ 0.2, 0, 0.2 ], [ - Math.PI / 2, 0, 0 ]]
+			[ new Mesh( new PlaneGeometry( 0.4, 0.4 ), matInvisible ), [ 0.2, 0, 0.2 ], [ - Math.PI / 2, 0, 0 ]]
 		]
 	};
 
 	var helperTranslate = {
 		START: [
-			[ new Mesh( new OctahedronBufferGeometry( 0.01, 2 ), matHelper ), null, null, null, 'helper' ]
+			[ new Mesh( new OctahedronGeometry( 0.01, 2 ), matHelper ), null, null, null, 'helper' ]
 		],
 		END: [
-			[ new Mesh( new OctahedronBufferGeometry( 0.01, 2 ), matHelper ), null, null, null, 'helper' ]
+			[ new Mesh( new OctahedronGeometry( 0.01, 2 ), matHelper ), null, null, null, 'helper' ]
 		],
 		DELTA: [
 			[ new Line( TranslateHelperGeometry(), matHelper ), null, null, null, 'helper' ]
@@ -945,22 +945,22 @@ var TransformControlsGizmo = function () {
 	var gizmoRotate = {
 		X: [
 			[ new Line( CircleGeometry( 1, 0.5 ), matLineRed ) ],
-			[ new Mesh( new OctahedronBufferGeometry( 0.04, 0 ), matRed ), [ 0, 0, 0.99 ], null, [ 1, 3, 1 ]],
+			[ new Mesh( new OctahedronGeometry( 0.04, 0 ), matRed ), [ 0, 0, 0.99 ], null, [ 1, 3, 1 ]],
 		],
 		Y: [
 			[ new Line( CircleGeometry( 1, 0.5 ), matLineGreen ), null, [ 0, 0, - Math.PI / 2 ]],
-			[ new Mesh( new OctahedronBufferGeometry( 0.04, 0 ), matGreen ), [ 0, 0, 0.99 ], null, [ 3, 1, 1 ]],
+			[ new Mesh( new OctahedronGeometry( 0.04, 0 ), matGreen ), [ 0, 0, 0.99 ], null, [ 3, 1, 1 ]],
 		],
 		Z: [
 			[ new Line( CircleGeometry( 1, 0.5 ), matLineBlue ), null, [ 0, Math.PI / 2, 0 ]],
-			[ new Mesh( new OctahedronBufferGeometry( 0.04, 0 ), matBlue ), [ 0.99, 0, 0 ], null, [ 1, 3, 1 ]],
+			[ new Mesh( new OctahedronGeometry( 0.04, 0 ), matBlue ), [ 0.99, 0, 0 ], null, [ 1, 3, 1 ]],
 		],
 		E: [
 			[ new Line( CircleGeometry( 1.25, 1 ), matLineYellowTransparent ), null, [ 0, Math.PI / 2, 0 ]],
-			[ new Mesh( new CylinderBufferGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 1.17, 0, 0 ], [ 0, 0, - Math.PI / 2 ], [ 1, 1, 0.001 ]],
-			[ new Mesh( new CylinderBufferGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ - 1.17, 0, 0 ], [ 0, 0, Math.PI / 2 ], [ 1, 1, 0.001 ]],
-			[ new Mesh( new CylinderBufferGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 0, - 1.17, 0 ], [ Math.PI, 0, 0 ], [ 1, 1, 0.001 ]],
-			[ new Mesh( new CylinderBufferGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 0, 1.17, 0 ], [ 0, 0, 0 ], [ 1, 1, 0.001 ]],
+			[ new Mesh( new CylinderGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 1.17, 0, 0 ], [ 0, 0, - Math.PI / 2 ], [ 1, 1, 0.001 ]],
+			[ new Mesh( new CylinderGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ - 1.17, 0, 0 ], [ 0, 0, Math.PI / 2 ], [ 1, 1, 0.001 ]],
+			[ new Mesh( new CylinderGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 0, - 1.17, 0 ], [ Math.PI, 0, 0 ], [ 1, 1, 0.001 ]],
+			[ new Mesh( new CylinderGeometry( 0.03, 0, 0.15, 4, 1, false ), matLineYellowTransparent ), [ 0, 1.17, 0 ], [ 0, 0, 0 ], [ 1, 1, 0.001 ]],
 		],
 		XYZE: [
 			[ new Line( CircleGeometry( 1, 1 ), matLineGray ), null, [ 0, Math.PI / 2, 0 ]]
@@ -975,19 +975,19 @@ var TransformControlsGizmo = function () {
 
 	var pickerRotate = {
 		X: [
-			[ new Mesh( new TorusBufferGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ 0, - Math.PI / 2, - Math.PI / 2 ]],
+			[ new Mesh( new TorusGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ 0, - Math.PI / 2, - Math.PI / 2 ]],
 		],
 		Y: [
-			[ new Mesh( new TorusBufferGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ Math.PI / 2, 0, 0 ]],
+			[ new Mesh( new TorusGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ Math.PI / 2, 0, 0 ]],
 		],
 		Z: [
-			[ new Mesh( new TorusBufferGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ 0, 0, - Math.PI / 2 ]],
+			[ new Mesh( new TorusGeometry( 1, 0.1, 4, 24 ), matInvisible ), [ 0, 0, 0 ], [ 0, 0, - Math.PI / 2 ]],
 		],
 		E: [
-			[ new Mesh( new TorusBufferGeometry( 1.25, 0.1, 2, 24 ), matInvisible ) ]
+			[ new Mesh( new TorusGeometry( 1.25, 0.1, 2, 24 ), matInvisible ) ]
 		],
 		XYZE: [
-			[ new Mesh( new SphereBufferGeometry( 0.7, 10, 8 ), matInvisible ) ]
+			[ new Mesh( new SphereGeometry( 0.7, 10, 8 ), matInvisible ) ]
 		]
 	};
 
@@ -1020,25 +1020,25 @@ var TransformControlsGizmo = function () {
 			[ new Line( lineGeometry, matLineMagenta ), [ 0.98, 0, 0.855 ], [ 0, - Math.PI / 2, 0 ], [ 0.125, 1, 1 ]]
 		],
 		XYZX: [
-			[ new Mesh( new BoxBufferGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 1.1, 0, 0 ]],
+			[ new Mesh( new BoxGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 1.1, 0, 0 ]],
 		],
 		XYZY: [
-			[ new Mesh( new BoxBufferGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 0, 1.1, 0 ]],
+			[ new Mesh( new BoxGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 0, 1.1, 0 ]],
 		],
 		XYZZ: [
-			[ new Mesh( new BoxBufferGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 0, 0, 1.1 ]],
+			[ new Mesh( new BoxGeometry( 0.125, 0.125, 0.125 ), matWhiteTransparent.clone() ), [ 0, 0, 1.1 ]],
 		]
 	};
 
 	var pickerScale = {
 		X: [
-			[ new Mesh( new CylinderBufferGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0.5, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]
+			[ new Mesh( new CylinderGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0.5, 0, 0 ], [ 0, 0, - Math.PI / 2 ]]
 		],
 		Y: [
-			[ new Mesh( new CylinderBufferGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0, 0.5, 0 ]]
+			[ new Mesh( new CylinderGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0, 0.5, 0 ]]
 		],
 		Z: [
-			[ new Mesh( new CylinderBufferGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0, 0, 0.5 ], [ Math.PI / 2, 0, 0 ]]
+			[ new Mesh( new CylinderGeometry( 0.2, 0, 0.8, 4, 1, false ), matInvisible ), [ 0, 0, 0.5 ], [ Math.PI / 2, 0, 0 ]]
 		],
 		XY: [
 			[ new Mesh( scaleHandleGeometry, matInvisible ), [ 0.85, 0.85, 0 ], null, [ 3, 3, 0.2 ]],
@@ -1050,13 +1050,13 @@ var TransformControlsGizmo = function () {
 			[ new Mesh( scaleHandleGeometry, matInvisible ), [ 0.85, 0, 0.85 ], null, [ 3, 0.2, 3 ]],
 		],
 		XYZX: [
-			[ new Mesh( new BoxBufferGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 1.1, 0, 0 ]],
+			[ new Mesh( new BoxGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 1.1, 0, 0 ]],
 		],
 		XYZY: [
-			[ new Mesh( new BoxBufferGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 0, 1.1, 0 ]],
+			[ new Mesh( new BoxGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 0, 1.1, 0 ]],
 		],
 		XYZZ: [
-			[ new Mesh( new BoxBufferGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 0, 0, 1.1 ]],
+			[ new Mesh( new BoxGeometry( 0.2, 0.2, 0.2 ), matInvisible ), [ 0, 0, 1.1 ]],
 		]
 	};
 
@@ -1583,7 +1583,7 @@ var TransformControlsPlane = function () {
 	'use strict';
 
 	Mesh.call( this,
-		new PlaneBufferGeometry( 100000, 100000, 2, 2 ),
+		new PlaneGeometry( 100000, 100000, 2, 2 ),
 		new MeshBasicMaterial( { visible: false, wireframe: true, side: DoubleSide, transparent: true, opacity: 0.1, toneMapped: false } )
 	);
 

examples/jsm/csm/CSMHelper.js

@@ -6,7 +6,7 @@ import {
 	LineBasicMaterial,
 	Box3Helper,
 	Box3,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	MeshBasicMaterial,
 	BufferAttribute,
 	DoubleSide
@@ -95,7 +95,7 @@ class CSMHelper extends Group {
 
 			const cascadeLine = new Box3Helper( new Box3(), 0xffffff );
 			const planeMat = new MeshBasicMaterial( { transparent: true, opacity: 0.1, depthWrite: false, side: DoubleSide } );
-			const cascadePlane = new Mesh( new PlaneBufferGeometry(), planeMat );
+			const cascadePlane = new Mesh( new PlaneGeometry(), planeMat );
 			const shadowLineGroup = new Group();
 			const shadowLine = new Box3Helper( new Box3(), 0xffff00 );
 			shadowLineGroup.add( shadowLine );

examples/jsm/effects/AnaglyphEffect.js

@@ -4,7 +4,7 @@ import {
 	Mesh,
 	NearestFilter,
 	OrthographicCamera,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	RGBAFormat,
 	Scene,
 	ShaderMaterial,
@@ -121,7 +121,7 @@ var AnaglyphEffect = function ( renderer, width, height ) {
 
 	} );
 
-	var _mesh = new Mesh( new PlaneBufferGeometry( 2, 2 ), _material );
+	var _mesh = new Mesh( new PlaneGeometry( 2, 2 ), _material );
 	_scene.add( _mesh );
 
 	this.setSize = function ( width, height ) {

examples/jsm/effects/ParallaxBarrierEffect.js

@@ -3,7 +3,7 @@ import {
 	Mesh,
 	NearestFilter,
 	OrthographicCamera,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	RGBAFormat,
 	Scene,
 	ShaderMaterial,
@@ -72,7 +72,7 @@ var ParallaxBarrierEffect = function ( renderer ) {
 
 	} );
 
-	var mesh = new Mesh( new PlaneBufferGeometry( 2, 2 ), _material );
+	var mesh = new Mesh( new PlaneGeometry( 2, 2 ), _material );
 	_scene.add( mesh );
 
 	this.setSize = function ( width, height ) {

examples/jsm/environments/RoomEnvironment.js

@@ -8,7 +8,7 @@ function RoomEnvironment() {
 
 	const scene = new THREE.Scene();
 
-	const geometry = new THREE.BoxBufferGeometry();
+	const geometry = new THREE.BoxGeometry();
 	geometry.deleteAttribute( 'uv' );
 
 	const roomMaterial = new THREE.MeshStandardMaterial( { side: THREE.BackSide } );

examples/jsm/geometries/ParametricGeometries.js

@@ -1,6 +1,6 @@
 import {
+	BufferGeometry,
 	Curve,
-	Geometry,
 	ParametricGeometry,
 	Vector3
 } from '../../../build/three.module.js';
@@ -150,7 +150,7 @@ ParametricGeometries.TubeGeometry = function ( path, segments, radius, segmentsR
 
 };
 
-ParametricGeometries.TubeGeometry.prototype = Object.create( Geometry.prototype );
+ParametricGeometries.TubeGeometry.prototype = Object.create( BufferGeometry.prototype );
 ParametricGeometries.TubeGeometry.prototype.constructor = ParametricGeometries.TubeGeometry;
 
 
@@ -201,7 +201,7 @@ ParametricGeometries.TorusKnotGeometry = function ( radius, tube, segmentsT, seg
 
 };
 
-ParametricGeometries.TorusKnotGeometry.prototype = Object.create( Geometry.prototype );
+ParametricGeometries.TorusKnotGeometry.prototype = Object.create( BufferGeometry.prototype );
 ParametricGeometries.TorusKnotGeometry.prototype.constructor = ParametricGeometries.TorusKnotGeometry;
 
 
@@ -229,7 +229,7 @@ ParametricGeometries.SphereGeometry = function ( size, u, v ) {
 
 };
 
-ParametricGeometries.SphereGeometry.prototype = Object.create( Geometry.prototype );
+ParametricGeometries.SphereGeometry.prototype = Object.create( BufferGeometry.prototype );
 ParametricGeometries.SphereGeometry.prototype.constructor = ParametricGeometries.SphereGeometry;
 
 
@@ -255,7 +255,7 @@ ParametricGeometries.PlaneGeometry = function ( width, depth, segmentsWidth, seg
 
 };
 
-ParametricGeometries.PlaneGeometry.prototype = Object.create( Geometry.prototype );
+ParametricGeometries.PlaneGeometry.prototype = Object.create( BufferGeometry.prototype );
 ParametricGeometries.PlaneGeometry.prototype.constructor = ParametricGeometries.PlaneGeometry;
 
 export { ParametricGeometries };

examples/jsm/geometries/RoundedBoxBufferGeometry.d.ts → examples/jsm/geometries/RoundedBoxGeometry.d.ts

@@ -1,8 +1,8 @@
 import {
-	BoxBufferGeometry
+	BoxGeometry
 } from '../../../src/Three';
 
-export class RoundedBoxBufferGeometry extends BoxBufferGeometry {
+export class RoundedBoxGeometry extends BoxGeometry {
 
 	constructor( width?: number, height?: number, depth?: number, segments?: number, radius?: number );
 

examples/jsm/geometries/RoundedBoxBufferGeometry.js → examples/jsm/geometries/RoundedBoxGeometry.js

@@ -1,5 +1,5 @@
 import {
-	BoxBufferGeometry,
+	BoxGeometry,
 	Vector3
 } from '../../../build/three.module.js';
 
@@ -37,7 +37,7 @@ function getUv( faceDirVector, normal, uvAxis, projectionAxis, radius, sideLengt
 
 }
 
-class RoundedBoxBufferGeometry extends BoxBufferGeometry {
+class RoundedBoxGeometry extends BoxGeometry {
 
 	constructor( width = 1, height = 1, depth = 1, segments = 2, radius = 0.1 ) {
 
@@ -151,4 +151,4 @@ class RoundedBoxBufferGeometry extends BoxBufferGeometry {
 
 }
 
-export { RoundedBoxBufferGeometry };
+export { RoundedBoxGeometry };

examples/jsm/helpers/LightProbeHelper.js

@@ -1,7 +1,7 @@
 import {
 	Mesh,
 	ShaderMaterial,
-	SphereBufferGeometry
+	SphereGeometry
 } from '../../../build/three.module.js';
 
 function LightProbeHelper( lightProbe, size ) {
@@ -98,7 +98,7 @@ function LightProbeHelper( lightProbe, size ) {
 
 	} );
 
-	var geometry = new SphereBufferGeometry( 1, 32, 16 );
+	var geometry = new SphereGeometry( 1, 32, 16 );
 
 	Mesh.call( this, geometry, material );
 

examples/jsm/loaders/VRMLLoader.js

@@ -1,12 +1,12 @@
 import {
 	BackSide,
-	BoxBufferGeometry,
+	BoxGeometry,
 	BufferAttribute,
 	BufferGeometry,
 	ClampToEdgeWrapping,
 	Color,
-	ConeBufferGeometry,
-	CylinderBufferGeometry,
+	ConeGeometry,
+	CylinderGeometry,
 	DataTexture,
 	DoubleSide,
 	FileLoader,
@@ -29,7 +29,7 @@ import {
 	RepeatWrapping,
 	Scene,
 	ShapeUtils,
-	SphereBufferGeometry,
+	SphereGeometry,
 	TextureLoader,
 	Vector2,
 	Vector3
@@ -906,7 +906,7 @@ var VRMLLoader = ( function () {
 
 				if ( skyColor ) {
 
-					var skyGeometry = new SphereBufferGeometry( radius, 32, 16 );
+					var skyGeometry = new SphereGeometry( radius, 32, 16 );
 					var skyMaterial = new MeshBasicMaterial( { fog: false, side: BackSide, depthWrite: false, depthTest: false } );
 
 					if ( skyColor.length > 3 ) {
@@ -931,7 +931,7 @@ var VRMLLoader = ( function () {
 
 					if ( groundColor.length > 0 ) {
 
-						var groundGeometry = new SphereBufferGeometry( radius, 32, 16, 0, 2 * Math.PI, 0.5 * Math.PI, 1.5 * Math.PI );
+						var groundGeometry = new SphereGeometry( radius, 32, 16, 0, 2 * Math.PI, 0.5 * Math.PI, 1.5 * Math.PI );
 						var groundMaterial = new MeshBasicMaterial( { fog: false, side: BackSide, vertexColors: true, depthWrite: false, depthTest: false } );
 
 						paintFaces( groundGeometry, radius, groundAngle, toColorArray( groundColor ), false );
@@ -2012,7 +2012,7 @@ var VRMLLoader = ( function () {
 
 				}
 
-				var geometry = new BoxBufferGeometry( size.x, size.y, size.z );
+				var geometry = new BoxGeometry( size.x, size.y, size.z );
 
 				return geometry;
 
@@ -2056,7 +2056,7 @@ var VRMLLoader = ( function () {
 
 				}
 
-				var geometry = new ConeBufferGeometry( radius, height, 16, 1, openEnded );
+				var geometry = new ConeGeometry( radius, height, 16, 1, openEnded );
 
 				return geometry;
 
@@ -2104,7 +2104,7 @@ var VRMLLoader = ( function () {
 
 				}
 
-				var geometry = new CylinderBufferGeometry( radius, radius, height, 16, 1 );
+				var geometry = new CylinderGeometry( radius, radius, height, 16, 1 );
 
 				return geometry;
 
@@ -2136,7 +2136,7 @@ var VRMLLoader = ( function () {
 
 				}
 
-				var geometry = new SphereBufferGeometry( radius, 16, 16 );
+				var geometry = new SphereGeometry( radius, 16, 16 );
 
 				return geometry;
 

examples/jsm/misc/ConvexObjectBreaker.js

@@ -24,7 +24,7 @@ import { ConvexGeometry } from '../geometries/ConvexGeometry.js';
  *  - Vertex normals must be planar (not smoothed)
  *
  *  - The geometry must be convex (this is not checked in the library). You can create convex
- *  geometries with ConvexGeometry. The BoxBufferGeometry, SphereBufferGeometry and other convex primitives
+ *  geometries with ConvexGeometry. The BoxGeometry, SphereGeometry and other convex primitives
  *  can also be used.
  *
  * Note: This lib adds member variables to object's userData member (see prepareBreakableObject function)

examples/jsm/misc/GPUComputationRenderer.js

@@ -5,7 +5,7 @@ import {
 	FloatType,
 	Mesh,
 	NearestFilter,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	RGBAFormat,
 	Scene,
 	ShaderMaterial,
@@ -128,7 +128,7 @@ var GPUComputationRenderer = function ( sizeX, sizeY, renderer ) {
 
 	var passThruShader = createShaderMaterial( getPassThroughFragmentShader(), passThruUniforms );
 
-	var mesh = new Mesh( new PlaneBufferGeometry( 2, 2 ), passThruShader );
+	var mesh = new Mesh( new PlaneGeometry( 2, 2 ), passThruShader );
 	scene.add( mesh );
 
 

examples/jsm/misc/Ocean.js

@@ -7,7 +7,7 @@ import {
 	Mesh,
 	NearestFilter,
 	OrthographicCamera,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	RGBAFormat,
 	RepeatWrapping,
 	Scene,
@@ -209,7 +209,7 @@ var Ocean = function ( renderer, camera, scene, options ) {
 	this.materialOcean.blending = 0;
 
 	// Create the simulation plane
-	this.screenQuad = new Mesh( new PlaneBufferGeometry( 2, 2 ) );
+	this.screenQuad = new Mesh( new PlaneGeometry( 2, 2 ) );
 	this.scene.add( this.screenQuad );
 
 	// Initialise spectrum data
@@ -222,7 +222,7 @@ var Ocean = function ( renderer, camera, scene, options ) {
 
 Ocean.prototype.generateMesh = function () {
 
-	var geometry = new PlaneBufferGeometry( this.geometrySize, this.geometrySize, this.geometryResolution, this.geometryResolution );
+	var geometry = new PlaneGeometry( this.geometrySize, this.geometrySize, this.geometryResolution, this.geometryResolution );
 
 	geometry.rotateX( - Math.PI / 2 );
 

examples/jsm/misc/VolumeSlice.js

@@ -4,7 +4,7 @@ import {
 	LinearFilter,
 	Mesh,
 	MeshBasicMaterial,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	Texture
 } from '../../../build/three.module.js';
 
@@ -209,7 +209,7 @@ VolumeSlice.prototype = {
 
 		if ( this.geometry ) this.geometry.dispose(); // dispose existing geometry
 
-		this.geometry = new PlaneBufferGeometry( extracted.planeWidth, extracted.planeHeight );
+		this.geometry = new PlaneGeometry( extracted.planeWidth, extracted.planeHeight );
 
 		if ( this.mesh ) {
 

examples/jsm/nodes/inputs/RTTNode.js

@@ -1,7 +1,7 @@
 import {
 	Mesh,
 	OrthographicCamera,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	Scene,
 	WebGLRenderTarget
 } from '../../../../build/three.module.js';
@@ -25,7 +25,7 @@ function RTTNode( width, height, input, options ) {
 	this.camera = new OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
 	this.scene = new Scene();
 
-	this.quad = new Mesh( new PlaneBufferGeometry( 2, 2 ), this.material );
+	this.quad = new Mesh( new PlaneGeometry( 2, 2 ), this.material );
 	this.quad.frustumCulled = false; // Avoid getting clipped
 	this.scene.add( this.quad );
 
@@ -66,7 +66,7 @@ RTTNode.prototype.updateFramesaveTo = function ( frame ) {
 
 		var scene = new Scene();
 
-		var quad = new Mesh( new PlaneBufferGeometry( 2, 2 ), material );
+		var quad = new Mesh( new PlaneGeometry( 2, 2 ), material );
 		quad.frustumCulled = false; // Avoid getting clipped
 		scene.add( quad );
 

examples/jsm/nodes/postprocessing/NodePostProcessing.js

@@ -2,7 +2,7 @@ import {
 	LinearFilter,
 	Mesh,
 	OrthographicCamera,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	RGBAFormat,
 	Scene,
 	Vector2,
@@ -36,7 +36,7 @@ function NodePostProcessing( renderer, renderTarget ) {
 	this.camera = new OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
 	this.scene = new Scene();
 
-	this.quad = new Mesh( new PlaneBufferGeometry( 2, 2 ), this.material );
+	this.quad = new Mesh( new PlaneGeometry( 2, 2 ), this.material );
 	this.quad.frustumCulled = false; // Avoid getting clipped
 	this.scene.add( this.quad );
 

examples/jsm/objects/Sky.d.ts

@@ -1,5 +1,5 @@
 import {
-	BoxBufferGeometry,
+	BoxGeometry,
 	Mesh,
 	ShaderMaterial
 } from '../../../src/Three';
@@ -8,7 +8,7 @@ export class Sky extends Mesh {
 
 	constructor();
 
-	geometry: BoxBufferGeometry;
+	geometry: BoxGeometry;
 	material: ShaderMaterial;
 
 	static SkyShader: object;

examples/jsm/objects/Sky.js

@@ -1,6 +1,6 @@
 import {
 	BackSide,
-	BoxBufferGeometry,
+	BoxGeometry,
 	Mesh,
 	ShaderMaterial,
 	UniformsUtils,
@@ -34,7 +34,7 @@ var Sky = function () {
 		depthWrite: false
 	} );
 
-	Mesh.call( this, new BoxBufferGeometry( 1, 1, 1 ), material );
+	Mesh.call( this, new BoxGeometry( 1, 1, 1 ), material );
 
 };
 

examples/jsm/offscreen/scene.js

@@ -22,7 +22,7 @@ function init( canvas, width, height, pixelRatio, path ) {
 
 		var texture = new THREE.CanvasTexture( imageBitmap );
 
-		var geometry = new THREE.IcosahedronBufferGeometry( 5, 8 );
+		var geometry = new THREE.IcosahedronGeometry( 5, 8 );
 		var materials = [
 			new THREE.MeshMatcapMaterial( { color: 0xaa24df, matcap: texture } ),
 			new THREE.MeshMatcapMaterial( { color: 0x605d90, matcap: texture } ),

examples/jsm/postprocessing/CubeTexturePass.js

@@ -1,6 +1,6 @@
 import {
 	BackSide,
-	BoxBufferGeometry,
+	BoxGeometry,
 	Mesh,
 	PerspectiveCamera,
 	Scene,
@@ -19,7 +19,7 @@ var CubeTexturePass = function ( camera, envMap, opacity ) {
 
 	this.cubeShader = ShaderLib[ 'cube' ];
 	this.cubeMesh = new Mesh(
-		new BoxBufferGeometry( 10, 10, 10 ),
+		new BoxGeometry( 10, 10, 10 ),
 		new ShaderMaterial( {
 			uniforms: this.cubeShader.uniforms,
 			vertexShader: this.cubeShader.vertexShader,

examples/jsm/postprocessing/EffectComposer.js

@@ -3,7 +3,7 @@ import {
 	LinearFilter,
 	Mesh,
 	OrthographicCamera,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	RGBAFormat,
 	Vector2,
 	WebGLRenderTarget
@@ -276,7 +276,7 @@ Object.assign( Pass.prototype, {
 Pass.FullScreenQuad = ( function () {
 
 	var camera = new OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
-	var geometry = new PlaneBufferGeometry( 2, 2 );
+	var geometry = new PlaneGeometry( 2, 2 );
 
 	var FullScreenQuad = function ( material ) {
 

examples/jsm/postprocessing/Pass.js

@@ -1,6 +1,6 @@
 import {
 	OrthographicCamera,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	Mesh
 } from '../../../build/three.module.js';
 
@@ -41,7 +41,7 @@ Object.assign( Pass.prototype, {
 Pass.FullScreenQuad = ( function () {
 
 	var camera = new OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
-	var geometry = new PlaneBufferGeometry( 2, 2 );
+	var geometry = new PlaneGeometry( 2, 2 );
 
 	var FullScreenQuad = function ( material ) {
 

examples/jsm/utils/RoughnessMipmapper.js

@@ -11,7 +11,7 @@ import {
 	Mesh,
 	NoBlending,
 	OrthographicCamera,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	RawShaderMaterial,
 	Vector2,
 	WebGLRenderTarget
@@ -19,7 +19,7 @@ import {
 
 var _mipmapMaterial = _getMipmapMaterial();
 
-var _mesh = new Mesh( new PlaneBufferGeometry( 2, 2 ), _mipmapMaterial );
+var _mesh = new Mesh( new PlaneGeometry( 2, 2 ), _mipmapMaterial );
 
 var _flatCamera = new OrthographicCamera( 0, 1, 0, 1, 0, 1 );
 

examples/jsm/utils/ShadowMapViewer.js

@@ -4,7 +4,7 @@ import {
 	Mesh,
 	MeshBasicMaterial,
 	OrthographicCamera,
-	PlaneBufferGeometry,
+	PlaneGeometry,
 	Scene,
 	ShaderMaterial,
 	Texture,
@@ -67,7 +67,7 @@ var ShadowMapViewer = function ( light ) {
 		vertexShader: shader.vertexShader,
 		fragmentShader: shader.fragmentShader
 	} );
-	var plane = new PlaneBufferGeometry( frame.width, frame.height );
+	var plane = new PlaneGeometry( frame.width, frame.height );
 	var mesh = new Mesh( plane, material );
 
 	scene.add( mesh );
@@ -99,7 +99,7 @@ var ShadowMapViewer = function ( light ) {
 		var labelMaterial = new MeshBasicMaterial( { map: labelTexture, side: DoubleSide } );
 		labelMaterial.transparent = true;
 
-		var labelPlane = new PlaneBufferGeometry( labelCanvas.width, labelCanvas.height );
+		var labelPlane = new PlaneGeometry( labelCanvas.width, labelCanvas.height );
 		labelMesh = new Mesh( labelPlane, labelMaterial );
 
 		scene.add( labelMesh );

examples/jsm/utils/UVsDebug.js

@@ -6,7 +6,7 @@ import {
  * tool for "unwrapping" and debugging three.js geometries UV mapping
  *
  * Sample usage:
- *	document.body.appendChild( UVsDebug( new THREE.SphereBufferGeometry( 10, 10, 10, 10 ) );
+ *	document.body.appendChild( UVsDebug( new THREE.SphereGeometry( 10, 10, 10, 10 ) );
  *
  */
 

examples/jsm/webxr/XRControllerModelFactory.js

@@ -3,7 +3,7 @@ import {
 	MeshBasicMaterial,
 	Object3D,
 	Quaternion,
-	SphereBufferGeometry,
+	SphereGeometry,
 } from '../../../build/three.module.js';
 
 import { GLTFLoader } from '../loaders/GLTFLoader.js';
@@ -127,7 +127,7 @@ function findNodes( motionController, scene ) {
 			if ( component.touchPointNode ) {
 
 				// Attach a touch dot to the touchpad.
-				const sphereGeometry = new SphereBufferGeometry( 0.001 );
+				const sphereGeometry = new SphereGeometry( 0.001 );
 				const material = new MeshBasicMaterial( { color: 0x0000FF } );
 				const sphere = new Mesh( sphereGeometry, material );
 				component.touchPointNode.add( sphere );

examples/jsm/webxr/XRHandPrimitiveModel.js

@@ -1,6 +1,6 @@
 import {
-	SphereBufferGeometry,
-	BoxBufferGeometry,
+	SphereGeometry,
+	BoxGeometry,
 	MeshStandardMaterial,
 	Mesh,
 	Group
@@ -24,11 +24,11 @@ class XRHandPrimitiveModel {
 
 			if ( ! options || ! options.primitive || options.primitive === 'sphere' ) {
 
-				geometry = new SphereBufferGeometry( 1, 10, 10 );
+				geometry = new SphereGeometry( 1, 10, 10 );
 
 			} else if ( options.primitive === 'box' ) {
 
-				geometry = new BoxBufferGeometry( 1, 1, 1 );
+				geometry = new BoxGeometry( 1, 1, 1 );
 
 			}
 

examples/misc_animation_groups.html

@@ -40,7 +40,7 @@
 
 				//
 
-				const geometry = new THREE.BoxBufferGeometry( 5, 5, 5 );
+				const geometry = new THREE.BoxGeometry( 5, 5, 5 );
 				const material = new THREE.MeshBasicMaterial( { transparent: true } );
 
 				//

examples/misc_animation_keys.html

@@ -41,7 +41,7 @@
 
 				//
 
-				const geometry = new THREE.BoxBufferGeometry( 5, 5, 5 );
+				const geometry = new THREE.BoxGeometry( 5, 5, 5 );
 				const material = new THREE.MeshBasicMaterial( { color: 0xffffff, transparent: true } );
 				const mesh = new THREE.Mesh( geometry, material );
 				scene.add( mesh );

examples/misc_boxselection.html

@@ -69,7 +69,7 @@
 
 				scene.add( light );
 
-				const geometry = new THREE.BoxBufferGeometry( 20, 20, 20 );
+				const geometry = new THREE.BoxGeometry( 20, 20, 20 );
 
 				for ( let i = 0; i < 200; i ++ ) {
 

examples/misc_controls_deviceorientation.html

@@ -42,7 +42,7 @@
 
 				scene = new THREE.Scene();
 
-				const geometry = new THREE.SphereBufferGeometry( 500, 60, 40 );
+				const geometry = new THREE.SphereGeometry( 500, 60, 40 );
 				// invert the geometry on the x-axis so that all of the faces point inward
 				geometry.scale( - 1, 1, 1 );
 
@@ -53,7 +53,7 @@
 				const mesh = new THREE.Mesh( geometry, material );
 				scene.add( mesh );
 
-				const helperGeometry = new THREE.BoxBufferGeometry( 100, 100, 100, 4, 4, 4 );
+				const helperGeometry = new THREE.BoxGeometry( 100, 100, 100, 4, 4, 4 );
 				const helperMaterial = new THREE.MeshBasicMaterial( { color: 0xff00ff, wireframe: true } );
 				const helper = new THREE.Mesh( helperGeometry, helperMaterial );
 				scene.add( helper );

examples/misc_controls_drag.html

@@ -68,7 +68,7 @@
 				group = new THREE.Group();
 				scene.add( group );
 
-				const geometry = new THREE.BoxBufferGeometry( 40, 40, 40 );
+				const geometry = new THREE.BoxGeometry( 40, 40, 40 );
 
 				for ( let i = 0; i < 200; i ++ ) {
 

examples/misc_controls_fly.html

@@ -92,7 +92,7 @@
 
 				// planet
 
-				geometry = new THREE.SphereBufferGeometry( radius, 100, 50 );
+				geometry = new THREE.SphereGeometry( radius, 100, 50 );
 
 				meshPlanet = new THREE.Mesh( geometry, materialNormalMap );
 				meshPlanet.rotation.y = 0;

examples/misc_controls_map.html

@@ -68,7 +68,7 @@
 
 				// world
 
-				const geometry = new THREE.BoxBufferGeometry( 1, 1, 1 );
+				const geometry = new THREE.BoxGeometry( 1, 1, 1 );
 				geometry.translate( 0, 0.5, 0 );
 				const material = new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true } );
 

examples/misc_controls_orbit.html

@@ -66,7 +66,7 @@
 
 				// world
 
-				const geometry = new THREE.CylinderBufferGeometry( 0, 10, 30, 4, 1 );
+				const geometry = new THREE.CylinderGeometry( 0, 10, 30, 4, 1 );
 				const material = new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true } );
 
 				for ( let i = 0; i < 500; i ++ ) {

examples/misc_controls_pointerlock.html

@@ -191,7 +191,7 @@
 
 				// floor
 
-				let floorGeometry = new THREE.PlaneBufferGeometry( 2000, 2000, 100, 100 );
+				let floorGeometry = new THREE.PlaneGeometry( 2000, 2000, 100, 100 );
 				floorGeometry.rotateX( - Math.PI / 2 );
 
 				// vertex displacement
@@ -231,7 +231,7 @@
 
 				// objects
 
-				const boxGeometry = new THREE.BoxBufferGeometry( 20, 20, 20 ).toNonIndexed();
+				const boxGeometry = new THREE.BoxGeometry( 20, 20, 20 ).toNonIndexed();
 
 				position = boxGeometry.attributes.position;
 				const colorsBox = [];

examples/misc_controls_trackball.html

@@ -58,7 +58,7 @@
 				scene.background = new THREE.Color( 0xcccccc );
 				scene.fog = new THREE.FogExp2( 0xcccccc, 0.002 );
 
-				const geometry = new THREE.CylinderBufferGeometry( 0, 10, 30, 4, 1 );
+				const geometry = new THREE.CylinderGeometry( 0, 10, 30, 4, 1 );
 				const material = new THREE.MeshPhongMaterial( { color: 0xffffff, flatShading: true } );
 
 				for ( let i = 0; i < 500; i ++ ) {

examples/misc_controls_transform.html

@@ -54,7 +54,7 @@
 				const texture = new THREE.TextureLoader().load( 'textures/crate.gif', render );
 				texture.anisotropy = renderer.capabilities.getMaxAnisotropy();
 
-				const geometry = new THREE.BoxBufferGeometry( 200, 200, 200 );
+				const geometry = new THREE.BoxGeometry( 200, 200, 200 );
 				const material = new THREE.MeshLambertMaterial( { map: texture, transparent: true } );
 
 				orbit = new OrbitControls( currentCamera, renderer.domElement );

examples/misc_exporter_draco.html

@@ -65,7 +65,7 @@
 				// ground
 
 				const ground = new THREE.Mesh(
-					new THREE.PlaneBufferGeometry( 2000, 2000 ),
+					new THREE.PlaneGeometry( 2000, 2000 ),
 					new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } )
 				);
 				ground.rotation.x = - Math.PI / 2;
@@ -81,7 +81,7 @@
 
 				// export mesh
 
-				const geometry = new THREE.TorusKnotBufferGeometry( 50, 15, 200, 30 );
+				const geometry = new THREE.TorusKnotGeometry( 50, 15, 200, 30 );
 				const material = new THREE.MeshPhongMaterial( { color: 0x00ff00 } );
 				mesh = new THREE.Mesh( geometry, material );
 				mesh.castShadow = true;

examples/misc_exporter_gltf.html

@@ -208,7 +208,7 @@
 					map: mapGrid
 				} );
 
-				object = new THREE.Mesh( new THREE.IcosahedronBufferGeometry( 75, 0 ), material );
+				object = new THREE.Mesh( new THREE.IcosahedronGeometry( 75, 0 ), material );
 				object.position.set( - 200, 0, 200 );
 				object.name = 'Icosahedron';
 				scene1.add( object );
@@ -218,7 +218,7 @@
 					color: 0x0000ff,
 					wireframe: true
 				} );
-				object = new THREE.Mesh( new THREE.OctahedronBufferGeometry( 75, 1 ), material );
+				object = new THREE.Mesh( new THREE.OctahedronGeometry( 75, 1 ), material );
 				object.position.set( 0, 0, 200 );
 				object.name = 'Octahedron';
 				scene1.add( object );
@@ -230,7 +230,7 @@
 					opacity: 0.5
 				} );
 
-				object = new THREE.Mesh( new THREE.TetrahedronBufferGeometry( 75, 0 ), material );
+				object = new THREE.Mesh( new THREE.TetrahedronGeometry( 75, 0 ), material );
 				object.position.set( 200, 0, 200 );
 				object.name = 'Tetrahedron';
 				scene1.add( object );
@@ -246,7 +246,7 @@
 					flatShading: true
 				} );
 				material.map = gradientTexture;
-				sphere = new THREE.Mesh( new THREE.SphereBufferGeometry( 70, 10, 10 ), material );
+				sphere = new THREE.Mesh( new THREE.SphereGeometry( 70, 10, 10 ), material );
 				sphere.position.set( 0, 0, 0 );
 				sphere.name = "Sphere";
 				scene1.add( sphere );
@@ -256,7 +256,7 @@
 					color: 0xff00ff,
 					flatShading: true
 				} );
-				object = new THREE.Mesh( new THREE.CylinderBufferGeometry( 10, 80, 100 ), material );
+				object = new THREE.Mesh( new THREE.CylinderGeometry( 10, 80, 100 ), material );
 				object.position.set( 200, 0, 0 );
 				object.name = "Cylinder";
 				scene1.add( object );
@@ -266,7 +266,7 @@
 					color: 0xff0000,
 					roughness: 1
 				} );
-				object = new THREE.Mesh( new THREE.TorusKnotBufferGeometry( 50, 15, 40, 10 ), material );
+				object = new THREE.Mesh( new THREE.TorusKnotGeometry( 50, 15, 40, 10 ), material );
 				object.position.set( - 200, 0, 0 );
 				object.name = "Cylinder";
 				scene1.add( object );
@@ -278,12 +278,12 @@
 				const mapWood = new THREE.TextureLoader().load( 'textures/hardwood2_diffuse.jpg' );
 				material = new THREE.MeshStandardMaterial( { map: mapWood, side: THREE.DoubleSide } );
 
-				object = new THREE.Mesh( new THREE.BoxBufferGeometry( 40, 100, 100 ), material );
+				object = new THREE.Mesh( new THREE.BoxGeometry( 40, 100, 100 ), material );
 				object.position.set( - 200, 0, 400 );
 				object.name = "Cube";
 				scene1.add( object );
 
-				object2 = new THREE.Mesh( new THREE.BoxBufferGeometry( 40, 40, 40, 2, 2, 2 ), material );
+				object2 = new THREE.Mesh( new THREE.BoxGeometry( 40, 40, 40, 2, 2, 2 ), material );
 				object2.position.set( 0, 0, 50 );
 				object2.rotation.set( 0, 45, 0 );
 				object2.name = "SubCube";
@@ -302,7 +302,7 @@
 				group2.position.set( 0, 50, 0 );
 				group1.add( group2 );
 
-				object2 = new THREE.Mesh( new THREE.BoxBufferGeometry( 30, 30, 30 ), material );
+				object2 = new THREE.Mesh( new THREE.BoxGeometry( 30, 30, 30 ), material );
 				object2.name = "Cube in group";
 				object2.position.set( 0, 0, 400 );
 				group2.add( object2 );
@@ -422,15 +422,15 @@
 					side: THREE.DoubleSide
 				} );
 
-				object = new THREE.Mesh( new THREE.CircleBufferGeometry( 50, 20, 0, Math.PI * 2 ), material );
+				object = new THREE.Mesh( new THREE.CircleGeometry( 50, 20, 0, Math.PI * 2 ), material );
 				object.position.set( 200, 0, - 400 );
 				scene1.add( object );
 
-				object = new THREE.Mesh( new THREE.RingBufferGeometry( 10, 50, 20, 5, 0, Math.PI * 2 ), material );
+				object = new THREE.Mesh( new THREE.RingGeometry( 10, 50, 20, 5, 0, Math.PI * 2 ), material );
 				object.position.set( 0, 0, - 400 );
 				scene1.add( object );
 
-				object = new THREE.Mesh( new THREE.CylinderBufferGeometry( 25, 75, 100, 40, 5 ), material );
+				object = new THREE.Mesh( new THREE.CylinderGeometry( 25, 75, 100, 40, 5 ), material );
 				object.position.set( - 200, 0, - 400 );
 				scene1.add( object );
 
@@ -443,7 +443,7 @@
 
 				}
 
-				object = new THREE.Mesh( new THREE.LatheBufferGeometry( points, 20 ), material );
+				object = new THREE.Mesh( new THREE.LatheGeometry( points, 20 ), material );
 				object.position.set( 200, 0, 400 );
 				scene1.add( object );
 
@@ -453,7 +453,7 @@
 				material = new THREE.MeshBasicMaterial( {
 					color: 0xff0000
 				} );
-				object = new THREE.Mesh( new THREE.BoxBufferGeometry( 200, 200, 200 ), material );
+				object = new THREE.Mesh( new THREE.BoxGeometry( 200, 200, 200 ), material );
 				object.position.set( 0, 0, 0 );
 				object.name = "CubeHidden";
 				object.visible = false;
@@ -477,7 +477,7 @@
 				// 2nd THREE.Scene
 				// ---------------------------------------------------------------------
 				scene2 = new THREE.Scene();
-				object = new THREE.Mesh( new THREE.BoxBufferGeometry( 100, 100, 100 ), material );
+				object = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100 ), material );
 				object.position.set( 0, 0, 0 );
 				object.name = "Cube2ndScene";
 				scene2.name = 'Scene2';

examples/misc_exporter_obj.html

@@ -80,13 +80,13 @@
 				} else if ( type === 2 ) {
 
 					const material = new THREE.MeshLambertMaterial( { color: 0x00cc00 } );
-					const geometry = new THREE.BoxBufferGeometry( 100, 100, 100 );
+					const geometry = new THREE.BoxGeometry( 100, 100, 100 );
 					scene.add( new THREE.Mesh( geometry, material ) );
 
 				} else if ( type === 3 ) {
 
 					const material = new THREE.MeshLambertMaterial( { color: 0x00cc00 } );
-					const geometry = new THREE.CylinderBufferGeometry( 50, 50, 100, 30, 1 );
+					const geometry = new THREE.CylinderGeometry( 50, 50, 100, 30, 1 );
 					scene.add( new THREE.Mesh( geometry, material ) );
 
 				} else if ( type === 4 || type === 5 ) {
@@ -98,11 +98,11 @@
 					mesh.position.x = - 200;
 					scene.add( mesh );
 
-					const geometry2 = new THREE.BoxBufferGeometry( 100, 100, 100 );
+					const geometry2 = new THREE.BoxGeometry( 100, 100, 100 );
 					const mesh2 = new THREE.Mesh( geometry2, material );
 					scene.add( mesh2 );
 
-					const geometry3 = new THREE.CylinderBufferGeometry( 50, 50, 100, 30, 1 );
+					const geometry3 = new THREE.CylinderGeometry( 50, 50, 100, 30, 1 );
 					const mesh3 = new THREE.Mesh( geometry3, material );
 					mesh3.position.x = 200;
 					scene.add( mesh3 );

examples/misc_exporter_ply.html

@@ -52,7 +52,7 @@
 
 				// ground
 
-				const ground = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2000, 2000 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
+				const ground = new THREE.Mesh( new THREE.PlaneGeometry( 2000, 2000 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
 				ground.rotation.x = - Math.PI / 2;
 				ground.receiveShadow = true;
 				scene.add( ground );
@@ -64,7 +64,7 @@
 
 				// export mesh
 
-				const geometry = new THREE.BoxBufferGeometry( 50, 50, 50 );
+				const geometry = new THREE.BoxGeometry( 50, 50, 50 );
 				const material = new THREE.MeshPhongMaterial( { color: 0x00ff00 } );
 
 				mesh = new THREE.Mesh( geometry, material );

examples/misc_exporter_stl.html

@@ -52,7 +52,7 @@
 
 				// ground
 
-				const ground = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2000, 2000 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
+				const ground = new THREE.Mesh( new THREE.PlaneGeometry( 2000, 2000 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
 				ground.rotation.x = - Math.PI / 2;
 				ground.receiveShadow = true;
 				scene.add( ground );
@@ -64,7 +64,7 @@
 
 				// export mesh
 
-				const geometry = new THREE.BoxBufferGeometry( 50, 50, 50 );
+				const geometry = new THREE.BoxGeometry( 50, 50, 50 );
 				const material = new THREE.MeshPhongMaterial( { color: 0x00ff00 } );
 
 				mesh = new THREE.Mesh( geometry, material );

examples/misc_lookat.html

@@ -48,10 +48,10 @@
 				scene = new THREE.Scene();
 				scene.background = new THREE.Color( 0xffffff );
 
-				sphere = new THREE.Mesh( new THREE.SphereBufferGeometry( 100, 20, 20 ), new THREE.MeshNormalMaterial() );
+				sphere = new THREE.Mesh( new THREE.SphereGeometry( 100, 20, 20 ), new THREE.MeshNormalMaterial() );
 				scene.add( sphere );
 
-				const geometry = new THREE.CylinderBufferGeometry( 0, 10, 100, 12 );
+				const geometry = new THREE.CylinderGeometry( 0, 10, 100, 12 );
 				geometry.rotateX( Math.PI / 2 );
 
 				const material = new THREE.MeshNormalMaterial();

examples/misc_uv_tests.html

@@ -57,23 +57,23 @@
 
 			//
 
-			test( 'new THREE.PlaneBufferGeometry( 100, 100, 4, 4 )', new THREE.PlaneBufferGeometry( 100, 100, 4, 4 ) );
+			test( 'new THREE.PlaneGeometry( 100, 100, 4, 4 )', new THREE.PlaneGeometry( 100, 100, 4, 4 ) );
 
-			test( 'new THREE.SphereBufferGeometry( 75, 12, 6 )', new THREE.SphereBufferGeometry( 75, 12, 6 ) );
+			test( 'new THREE.SphereGeometry( 75, 12, 6 )', new THREE.SphereGeometry( 75, 12, 6 ) );
 
-			test( 'new THREE.IcosahedronBufferGeometry( 30, 1 )', new THREE.IcosahedronBufferGeometry( 30, 1 ) );
+			test( 'new THREE.IcosahedronGeometry( 30, 1 )', new THREE.IcosahedronGeometry( 30, 1 ) );
 
-			test( 'new THREE.OctahedronBufferGeometry( 30, 2 )', new THREE.OctahedronBufferGeometry( 30, 2 ) );
+			test( 'new THREE.OctahedronGeometry( 30, 2 )', new THREE.OctahedronGeometry( 30, 2 ) );
 
-			test( 'new THREE.CylinderBufferGeometry( 25, 75, 100, 10, 5 )', new THREE.CylinderBufferGeometry( 25, 75, 100, 10, 5 ) );
+			test( 'new THREE.CylinderGeometry( 25, 75, 100, 10, 5 )', new THREE.CylinderGeometry( 25, 75, 100, 10, 5 ) );
 
-			test( 'new THREE.BoxBufferGeometry( 100, 100, 100, 4, 4, 4 )', new THREE.BoxBufferGeometry( 100, 100, 100, 4, 4, 4 ) );
+			test( 'new THREE.BoxGeometry( 100, 100, 100, 4, 4, 4 )', new THREE.BoxGeometry( 100, 100, 100, 4, 4, 4 ) );
 
-			test( 'new THREE.LatheBufferGeometry( points, 8 )', new THREE.LatheBufferGeometry( points, 8 ) );
+			test( 'new THREE.LatheGeometry( points, 8 )', new THREE.LatheGeometry( points, 8 ) );
 
-			test( 'new THREE.TorusBufferGeometry( 50, 20, 8, 8 )', new THREE.TorusBufferGeometry( 50, 20, 8, 8 ) );
+			test( 'new THREE.TorusGeometry( 50, 20, 8, 8 )', new THREE.TorusGeometry( 50, 20, 8, 8 ) );
 
-			test( 'new THREE.TorusKnotBufferGeometry( 50, 10, 12, 6 )', new THREE.TorusKnotBufferGeometry( 50, 10, 12, 6 ) );
+			test( 'new THREE.TorusKnotGeometry( 50, 10, 12, 6 )', new THREE.TorusKnotGeometry( 50, 10, 12, 6 ) );
 
 		</script>
 

examples/physics_ammo_break.html

@@ -168,7 +168,7 @@
 
 		function createObject( mass, halfExtents, pos, quat, material ) {
 
-			const object = new THREE.Mesh( new THREE.BoxBufferGeometry( halfExtents.x * 2, halfExtents.y * 2, halfExtents.z * 2 ), material );
+			const object = new THREE.Mesh( new THREE.BoxGeometry( halfExtents.x * 2, halfExtents.y * 2, halfExtents.z * 2 ), material );
 			object.position.copy( pos );
 			object.quaternion.copy( quat );
 			convexBreaker.prepareBreakableObject( object, mass, new THREE.Vector3(), new THREE.Vector3(), true );
@@ -246,7 +246,7 @@
 
 		function createParalellepipedWithPhysics( sx, sy, sz, mass, pos, quat, material ) {
 
-			const object = new THREE.Mesh( new THREE.BoxBufferGeometry( sx, sy, sz, 1, 1, 1 ), material );
+			const object = new THREE.Mesh( new THREE.BoxGeometry( sx, sy, sz, 1, 1, 1 ), material );
 			const shape = new Ammo.btBoxShape( new Ammo.btVector3( sx * 0.5, sy * 0.5, sz * 0.5 ) );
 			shape.setMargin( margin );
 
@@ -393,7 +393,7 @@
 				const ballMass = 35;
 				const ballRadius = 0.4;
 
-				const ball = new THREE.Mesh( new THREE.SphereBufferGeometry( ballRadius, 14, 10 ), ballMaterial );
+				const ball = new THREE.Mesh( new THREE.SphereGeometry( ballRadius, 14, 10 ), ballMaterial );
 				ball.castShadow = true;
 				ball.receiveShadow = true;
 				const ballShape = new Ammo.btSphereShape( ballRadius );

examples/physics_ammo_cloth.html

@@ -217,7 +217,7 @@
 				const clothNumSegmentsY = clothHeight * 5;
 				const clothPos = new THREE.Vector3( - 3, 3, 2 );
 
-				const clothGeometry = new THREE.PlaneBufferGeometry( clothWidth, clothHeight, clothNumSegmentsZ, clothNumSegmentsY );
+				const clothGeometry = new THREE.PlaneGeometry( clothWidth, clothHeight, clothNumSegmentsZ, clothNumSegmentsY );
 				clothGeometry.rotateY( Math.PI * 0.5 );
 				clothGeometry.translate( clothPos.x, clothPos.y + clothHeight * 0.5, clothPos.z - clothWidth * 0.5 );
 
@@ -289,7 +289,7 @@
 
 			function createParalellepiped( sx, sy, sz, mass, pos, quat, material ) {
 
-				const threeObject = new THREE.Mesh( new THREE.BoxBufferGeometry( sx, sy, sz, 1, 1, 1 ), material );
+				const threeObject = new THREE.Mesh( new THREE.BoxGeometry( sx, sy, sz, 1, 1, 1 ), material );
 				const shape = new Ammo.btBoxShape( new Ammo.btVector3( sx * 0.5, sy * 0.5, sz * 0.5 ) );
 				shape.setMargin( margin );
 

examples/physics_ammo_instancing.html

@@ -53,7 +53,7 @@
 				scene.add( dirLight );
 
 				const floor = new THREE.Mesh(
-					new THREE.BoxBufferGeometry( 10, 5, 10 ),
+					new THREE.BoxGeometry( 10, 5, 10 ),
 					new THREE.ShadowMaterial( { color: 0x111111 } )
 				);
 				floor.position.y = - 2.5;
@@ -70,7 +70,7 @@
 
 				// Boxes
 
-				const geometryBox = new THREE.BoxBufferGeometry( 0.1, 0.1, 0.1 );
+				const geometryBox = new THREE.BoxGeometry( 0.1, 0.1, 0.1 );
 				boxes = new THREE.InstancedMesh( geometryBox, material, 100 );
 				boxes.castShadow = true;
 				boxes.receiveShadow = true;
@@ -88,7 +88,7 @@
 
 				// Spheres
 
-				const geometrySphere = new THREE.IcosahedronBufferGeometry( 0.075, 3 );
+				const geometrySphere = new THREE.IcosahedronGeometry( 0.075, 3 );
 				spheres = new THREE.InstancedMesh( geometrySphere, material, 100 );
 				spheres.castShadow = true;
 				spheres.receiveShadow = true;

examples/physics_ammo_rope.html

@@ -163,7 +163,7 @@
 			const ballMass = 1.2;
 			const ballRadius = 0.6;
 
-			const ball = new THREE.Mesh( new THREE.SphereBufferGeometry( ballRadius, 20, 20 ), new THREE.MeshPhongMaterial( { color: 0x202020 } ) );
+			const ball = new THREE.Mesh( new THREE.SphereGeometry( ballRadius, 20, 20 ), new THREE.MeshPhongMaterial( { color: 0x202020 } ) );
 			ball.castShadow = true;
 			ball.receiveShadow = true;
 			const ballShape = new Ammo.btSphereShape( ballRadius );
@@ -314,7 +314,7 @@
 
 		function createParalellepiped( sx, sy, sz, mass, pos, quat, material ) {
 
-			const threeObject = new THREE.Mesh( new THREE.BoxBufferGeometry( sx, sy, sz, 1, 1, 1 ), material );
+			const threeObject = new THREE.Mesh( new THREE.BoxGeometry( sx, sy, sz, 1, 1, 1 ), material );
 			const shape = new Ammo.btBoxShape( new Ammo.btVector3( sx * 0.5, sy * 0.5, sz * 0.5 ) );
 			shape.setMargin( margin );
 

examples/physics_ammo_terrain.html

@@ -105,7 +105,7 @@
 				const controls = new OrbitControls( camera, renderer.domElement );
 				controls.enableZoom = false;
 
-				const geometry = new THREE.PlaneBufferGeometry( terrainWidthExtents, terrainDepthExtents, terrainWidth - 1, terrainDepth - 1 );
+				const geometry = new THREE.PlaneGeometry( terrainWidthExtents, terrainDepthExtents, terrainWidth - 1, terrainDepth - 1 );
 				geometry.rotateX( - Math.PI / 2 );
 
 				const vertices = geometry.attributes.position.array;
@@ -312,7 +312,7 @@
 					case 1:
 						// Sphere
 						radius = 1 + Math.random() * objectSize;
-						threeObject = new THREE.Mesh( new THREE.SphereBufferGeometry( radius, 20, 20 ), createObjectMaterial() );
+						threeObject = new THREE.Mesh( new THREE.SphereGeometry( radius, 20, 20 ), createObjectMaterial() );
 						shape = new Ammo.btSphereShape( radius );
 						shape.setMargin( margin );
 						break;
@@ -321,7 +321,7 @@
 						const sx = 1 + Math.random() * objectSize;
 						const sy = 1 + Math.random() * objectSize;
 						const sz = 1 + Math.random() * objectSize;
-						threeObject = new THREE.Mesh( new THREE.BoxBufferGeometry( sx, sy, sz, 1, 1, 1 ), createObjectMaterial() );
+						threeObject = new THREE.Mesh( new THREE.BoxGeometry( sx, sy, sz, 1, 1, 1 ), createObjectMaterial() );
 						shape = new Ammo.btBoxShape( new Ammo.btVector3( sx * 0.5, sy * 0.5, sz * 0.5 ) );
 						shape.setMargin( margin );
 						break;
@@ -329,7 +329,7 @@
 						// Cylinder
 						radius = 1 + Math.random() * objectSize;
 						height = 1 + Math.random() * objectSize;
-						threeObject = new THREE.Mesh( new THREE.CylinderBufferGeometry( radius, radius, height, 20, 1 ), createObjectMaterial() );
+						threeObject = new THREE.Mesh( new THREE.CylinderGeometry( radius, radius, height, 20, 1 ), createObjectMaterial() );
 						shape = new Ammo.btCylinderShape( new Ammo.btVector3( radius, height * 0.5, radius ) );
 						shape.setMargin( margin );
 						break;
@@ -337,7 +337,7 @@
 						// Cone
 						radius = 1 + Math.random() * objectSize;
 						height = 2 + Math.random() * objectSize;
-						threeObject = new THREE.Mesh( new THREE.ConeBufferGeometry( radius, height, 20, 2 ), createObjectMaterial() );
+						threeObject = new THREE.Mesh( new THREE.ConeGeometry( radius, height, 20, 2 ), createObjectMaterial() );
 						shape = new Ammo.btConeShape( radius, height );
 						break;
 

examples/physics_ammo_volume.html

@@ -162,11 +162,11 @@
 				// Create soft volumes
 				const volumeMass = 15;
 
-				const sphereGeometry = new THREE.SphereBufferGeometry( 1.5, 40, 25 );
+				const sphereGeometry = new THREE.SphereGeometry( 1.5, 40, 25 );
 				sphereGeometry.translate( 5, 5, 0 );
 				createSoftVolume( sphereGeometry, volumeMass, 250 );
 
-				const boxGeometry = new THREE.BoxBufferGeometry( 1, 1, 5, 4, 4, 20 );
+				const boxGeometry = new THREE.BoxGeometry( 1, 1, 5, 4, 4, 20 );
 				boxGeometry.translate( - 2, 5, 0 );
 				createSoftVolume( boxGeometry, volumeMass, 120 );
 
@@ -297,7 +297,7 @@
 
 			function createParalellepiped( sx, sy, sz, mass, pos, quat, material ) {
 
-				const threeObject = new THREE.Mesh( new THREE.BoxBufferGeometry( sx, sy, sz, 1, 1, 1 ), material );
+				const threeObject = new THREE.Mesh( new THREE.BoxGeometry( sx, sy, sz, 1, 1, 1 ), material );
 				const shape = new Ammo.btBoxShape( new Ammo.btVector3( sx * 0.5, sy * 0.5, sz * 0.5 ) );
 				shape.setMargin( margin );
 
@@ -372,7 +372,7 @@
 					const ballMass = 3;
 					const ballRadius = 0.4;
 
-					const ball = new THREE.Mesh( new THREE.SphereBufferGeometry( ballRadius, 18, 16 ), ballMaterial );
+					const ball = new THREE.Mesh( new THREE.SphereGeometry( ballRadius, 18, 16 ), ballMaterial );
 					ball.castShadow = true;
 					ball.receiveShadow = true;
 					const ballShape = new Ammo.btSphereShape( ballRadius );

examples/svg_sandbox.html

@@ -49,7 +49,7 @@
 
 				// CUBES
 
-				const boxGeometry = new THREE.BoxBufferGeometry( 100, 100, 100 );
+				const boxGeometry = new THREE.BoxGeometry( 100, 100, 100 );
 
 				let mesh = new THREE.Mesh( boxGeometry, new THREE.MeshBasicMaterial( { color: 0x0000ff, opacity: 0.5, transparent: true } ) );
 				mesh.position.x = 500;
@@ -68,14 +68,14 @@
 
 				// PLANE
 
-				mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 100, 100 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, side: THREE.DoubleSide } ) );
+				mesh = new THREE.Mesh( new THREE.PlaneGeometry( 100, 100 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, side: THREE.DoubleSide } ) );
 				mesh.position.y = - 500;
 				mesh.scale.x = mesh.scale.y = mesh.scale.z = 2;
 				scene.add( mesh );
 
 				// CYLINDER
 
-				mesh = new THREE.Mesh( new THREE.CylinderBufferGeometry( 20, 100, 200, 10 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff } ) );
+				mesh = new THREE.Mesh( new THREE.CylinderGeometry( 20, 100, 200, 10 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff } ) );
 				mesh.position.x = - 500;
 				mesh.rotation.x = - Math.PI / 2;
 				mesh.scale.x = mesh.scale.y = mesh.scale.z = 2;

examples/webaudio_orientation.html

@@ -75,7 +75,7 @@
 
 			//
 
-			const mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 50, 50 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
+			const mesh = new THREE.Mesh( new THREE.PlaneGeometry( 50, 50 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
 			mesh.rotation.x = - Math.PI / 2;
 			mesh.receiveShadow = true;
 			scene.add( mesh );
@@ -128,7 +128,7 @@
 
 			// sound is damped behind this wall
 
-			const wallGeometry = new THREE.BoxBufferGeometry( 2, 1, 0.1 );
+			const wallGeometry = new THREE.BoxGeometry( 2, 1, 0.1 );
 			const wallMaterial = new THREE.MeshBasicMaterial( { color: 0xff0000, transparent: true, opacity: 0.5 } );
 
 			const wall = new THREE.Mesh( wallGeometry, wallMaterial );

examples/webaudio_sandbox.html

@@ -55,7 +55,7 @@
 				light.position.set( 0, 0.5, 1 ).normalize();
 				scene.add( light );
 
-				const sphere = new THREE.SphereBufferGeometry( 20, 32, 16 );
+				const sphere = new THREE.SphereGeometry( 20, 32, 16 );
 
 				material1 = new THREE.MeshPhongMaterial( { color: 0xffaa00, flatShading: true, shininess: 0 } );
 				material2 = new THREE.MeshPhongMaterial( { color: 0xff2200, flatShading: true, shininess: 0 } );

examples/webaudio_timing.html

@@ -80,7 +80,7 @@
 
 			// floor
 
-			const floorGeometry = new THREE.PlaneBufferGeometry( 10, 10 );
+			const floorGeometry = new THREE.PlaneGeometry( 10, 10 );
 			const floorMaterial = new THREE.MeshLambertMaterial( { color: 0x4676b6 } );
 
 			const floor = new THREE.Mesh( floorGeometry, floorMaterial );
@@ -93,7 +93,7 @@
 			const count = 5;
 			const radius = 3;
 
-			const ballGeometry = new THREE.SphereBufferGeometry( 0.3, 32, 16 );
+			const ballGeometry = new THREE.SphereGeometry( 0.3, 32, 16 );
 			ballGeometry.translate( 0, 0.3, 0 );
 			const ballMaterial = new THREE.MeshLambertMaterial( { color: 0xcccccc } );
 

examples/webaudio_visualizer.html

@@ -129,7 +129,7 @@
 
 				} );
 
-				const geometry = new THREE.PlaneBufferGeometry( 1, 1 );
+				const geometry = new THREE.PlaneGeometry( 1, 1 );
 
 				const mesh = new THREE.Mesh( geometry, material );
 				scene.add( mesh );

examples/webgl2_materials_texture2darray.html

@@ -110,7 +110,7 @@
 							glslVersion: THREE.GLSL3
 						} );
 
-						const geometry = new THREE.PlaneBufferGeometry( planeWidth, planeHeight );
+						const geometry = new THREE.PlaneGeometry( planeWidth, planeHeight );
 
 						mesh = new THREE.Mesh( geometry, material );
 

examples/webgl2_materials_texture3d.html

@@ -116,7 +116,7 @@
 				} );
 
 				// THREE.Mesh
-				const geometry = new THREE.BoxBufferGeometry( volume.xLength, volume.yLength, volume.zLength );
+				const geometry = new THREE.BoxGeometry( volume.xLength, volume.yLength, volume.zLength );
 				geometry.translate( volume.xLength / 2 - 0.5, volume.yLength / 2 - 0.5, volume.zLength / 2 - 0.5 );
 
 				const mesh = new THREE.Mesh( geometry, material );

examples/webgl2_multisampled_renderbuffers.html

@@ -79,7 +79,7 @@
 
 				group = new THREE.Group();
 
-				const geometry = new THREE.SphereBufferGeometry( 10, 64, 40 );
+				const geometry = new THREE.SphereGeometry( 10, 64, 40 );
 				const material = new THREE.MeshLambertMaterial( { color: 0xee0808 } );
 				const material2 = new THREE.MeshBasicMaterial( { color: 0xffffff, wireframe: true } );
 

examples/webgl2_volume_cloud.html

@@ -61,7 +61,7 @@
 				context.fillRect( 0, 0, 1, 32 );
 
 				const sky = new THREE.Mesh(
-					new THREE.SphereBufferGeometry( 10 ),
+					new THREE.SphereGeometry( 10 ),
 					new THREE.MeshBasicMaterial( { map: new THREE.CanvasTexture( canvas ), side: THREE.BackSide } )
 				);
 				scene.add( sky );
@@ -230,7 +230,7 @@
 					}
 				`;
 
-				const geometry = new THREE.BoxBufferGeometry( 1, 1, 1 );
+				const geometry = new THREE.BoxGeometry( 1, 1, 1 );
 				const material = new THREE.RawShaderMaterial( {
 					glslVersion: THREE.GLSL3,
 					uniforms: {

examples/webgl2_volume_instancing.html

@@ -188,7 +188,7 @@
 						texture.magFilter = THREE.LinearFilter;
 						texture.unpackAlignment = 1;
 
-						const geometry = new THREE.BoxBufferGeometry( 1, 1, 1 );
+						const geometry = new THREE.BoxGeometry( 1, 1, 1 );
 						const material = new THREE.RawShaderMaterial( {
 							glslVersion: THREE.GLSL3,
 							uniforms: {

examples/webgl2_volume_perlin.html

@@ -189,7 +189,7 @@
 					}
 				`;
 
-				const geometry = new THREE.BoxBufferGeometry( 1, 1, 1 );
+				const geometry = new THREE.BoxGeometry( 1, 1, 1 );
 				const material = new THREE.RawShaderMaterial( {
 					glslVersion: THREE.GLSL3,
 					uniforms: {

examples/webgl_animation_cloth.html

@@ -481,7 +481,7 @@
 
 				// sphere
 
-				const ballGeo = new THREE.SphereBufferGeometry( ballSize, 32, 16 );
+				const ballGeo = new THREE.SphereGeometry( ballSize, 32, 16 );
 				const ballMaterial = new THREE.MeshLambertMaterial();
 
 				sphere = new THREE.Mesh( ballGeo, ballMaterial );
@@ -500,7 +500,7 @@
 
 				const groundMaterial = new THREE.MeshLambertMaterial( { map: groundTexture } );
 
-				let mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 20000, 20000 ), groundMaterial );
+				let mesh = new THREE.Mesh( new THREE.PlaneGeometry( 20000, 20000 ), groundMaterial );
 				mesh.position.y = - 250;
 				mesh.rotation.x = - Math.PI / 2;
 				mesh.receiveShadow = true;
@@ -508,7 +508,7 @@
 
 				// poles
 
-				const poleGeo = new THREE.BoxBufferGeometry( 5, 375, 5 );
+				const poleGeo = new THREE.BoxGeometry( 5, 375, 5 );
 				const poleMat = new THREE.MeshLambertMaterial();
 
 				mesh = new THREE.Mesh( poleGeo, poleMat );
@@ -525,14 +525,14 @@
 				mesh.castShadow = true;
 				scene.add( mesh );
 
-				mesh = new THREE.Mesh( new THREE.BoxBufferGeometry( 255, 5, 5 ), poleMat );
+				mesh = new THREE.Mesh( new THREE.BoxGeometry( 255, 5, 5 ), poleMat );
 				mesh.position.y = - 250 + ( 750 / 2 );
 				mesh.position.x = 0;
 				mesh.receiveShadow = true;
 				mesh.castShadow = true;
 				scene.add( mesh );
 
-				const gg = new THREE.BoxBufferGeometry( 10, 10, 10 );
+				const gg = new THREE.BoxGeometry( 10, 10, 10 );
 				mesh = new THREE.Mesh( gg, poleMat );
 				mesh.position.y = - 250;
 				mesh.position.x = 125;

examples/webgl_animation_multiple.html

@@ -359,7 +359,7 @@
 
 				// ground
 				const groundMesh = new THREE.Mesh(
-					new THREE.PlaneBufferGeometry( 40, 40 ),
+					new THREE.PlaneGeometry( 40, 40 ),
 					new THREE.MeshPhongMaterial( {
 						color: 0x999999,
 						depthWrite: false

examples/webgl_animation_skinning_additive_blending.html

@@ -84,7 +84,7 @@
 
 				// ground
 
-				const mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 100, 100 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
+				const mesh = new THREE.Mesh( new THREE.PlaneGeometry( 100, 100 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
 				mesh.rotation.x = - Math.PI / 2;
 				mesh.receiveShadow = true;
 				scene.add( mesh );

examples/webgl_animation_skinning_blending.html

@@ -88,7 +88,7 @@
 
 				// ground
 
-				const mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 100, 100 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
+				const mesh = new THREE.Mesh( new THREE.PlaneGeometry( 100, 100 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
 				mesh.rotation.x = - Math.PI / 2;
 				mesh.receiveShadow = true;
 				scene.add( mesh );

examples/webgl_animation_skinning_morph.html

@@ -78,7 +78,7 @@
 
 				// ground
 
-				const mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2000, 2000 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
+				const mesh = new THREE.Mesh( new THREE.PlaneGeometry( 2000, 2000 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
 				mesh.rotation.x = - Math.PI / 2;
 				scene.add( mesh );
 

examples/webgl_buffergeometry_compression.html

@@ -125,13 +125,13 @@
 					switch ( data.model ) {
 
 						case "Icosahedron":
-							return new THREE.IcosahedronBufferGeometry( radius, data.detail );
+							return new THREE.IcosahedronGeometry( radius, data.detail );
 						case "Cylinder":
-							return new THREE.CylinderBufferGeometry( radius, radius, radius * 2, data.detail * 6 );
+							return new THREE.CylinderGeometry( radius, radius, radius * 2, data.detail * 6 );
 						case "Teapot":
 							return new TeapotBufferGeometry( radius, data.detail * 3, true, true, true, true, true );
 						case "TorusKnot":
-							return new THREE.TorusKnotBufferGeometry( radius, 10, data.detail * 20, data.detail * 6, 3, 4 );
+							return new THREE.TorusKnotGeometry( radius, 10, data.detail * 20, data.detail * 6, 3, 4 );
 
 		}
 

examples/webgl_buffergeometry_drawrange.html

@@ -95,7 +95,7 @@
 				group = new THREE.Group();
 				scene.add( group );
 
-				const helper = new THREE.BoxHelper( new THREE.Mesh( new THREE.BoxBufferGeometry( r, r, r ) ) );
+				const helper = new THREE.BoxHelper( new THREE.Mesh( new THREE.BoxGeometry( r, r, r ) ) );
 				helper.material.color.setHex( 0x101010 );
 				helper.material.blending = THREE.AdditiveBlending;
 				helper.material.transparent = true;

examples/webgl_buffergeometry_instancing_billboards.html

@@ -99,7 +99,7 @@
 
 			scene = new THREE.Scene();
 
-			const circleGeometry = new THREE.CircleBufferGeometry( 1, 6 );
+			const circleGeometry = new THREE.CircleGeometry( 1, 6 );
 
 			geometry = new THREE.InstancedBufferGeometry();
 			geometry.index = circleGeometry.index;

examples/webgl_camera.html

@@ -80,20 +80,20 @@
 				//
 
 				mesh = new THREE.Mesh(
-					new THREE.SphereBufferGeometry( 100, 16, 8 ),
+					new THREE.SphereGeometry( 100, 16, 8 ),
 					new THREE.MeshBasicMaterial( { color: 0xffffff, wireframe: true } )
 				);
 				scene.add( mesh );
 
 				const mesh2 = new THREE.Mesh(
-					new THREE.SphereBufferGeometry( 50, 16, 8 ),
+					new THREE.SphereGeometry( 50, 16, 8 ),
 					new THREE.MeshBasicMaterial( { color: 0x00ff00, wireframe: true } )
 				);
 				mesh2.position.y = 150;
 				mesh.add( mesh2 );
 
 				const mesh3 = new THREE.Mesh(
-					new THREE.SphereBufferGeometry( 5, 16, 8 ),
+					new THREE.SphereGeometry( 5, 16, 8 ),
 					new THREE.MeshBasicMaterial( { color: 0x0000ff, wireframe: true } )
 				);
 				mesh3.position.z = 150;

examples/webgl_camera_array.html

@@ -59,7 +59,7 @@
 				light.shadow.camera.zoom = 4; // tighter shadow map
 				scene.add( light );
 
-				const geometryBackground = new THREE.PlaneBufferGeometry( 100, 100 );
+				const geometryBackground = new THREE.PlaneGeometry( 100, 100 );
 				const materialBackground = new THREE.MeshPhongMaterial( { color: 0x000066 } );
 
 				const background = new THREE.Mesh( geometryBackground, materialBackground );
@@ -67,7 +67,7 @@
 				background.position.set( 0, 0, - 1 );
 				scene.add( background );
 
-				const geometryCylinder = new THREE.CylinderBufferGeometry( 0.5, 0.5, 1, 32 );
+				const geometryCylinder = new THREE.CylinderGeometry( 0.5, 0.5, 1, 32 );
 				const materialCylinder = new THREE.MeshPhongMaterial( { color: 0xff0000 } );
 
 				mesh = new THREE.Mesh( geometryCylinder, materialCylinder );

examples/webgl_camera_cinematic.html

@@ -55,7 +55,7 @@
 				light.position.set( 1, 1, 1 ).normalize();
 				scene.add( light );
 
-				const geometry = new THREE.BoxBufferGeometry( 20, 20, 20 );
+				const geometry = new THREE.BoxGeometry( 20, 20, 20 );
 
 				for ( let i = 0; i < 1500; i ++ ) {
 

examples/webgl_camera_logarithmicdepthbuffer.html

@@ -168,13 +168,13 @@
 					emissive: 0x000000
 				};
 
-				const geometry = new THREE.SphereBufferGeometry( 0.5, 24, 12 );
+				const geometry = new THREE.SphereGeometry( 0.5, 24, 12 );
 
 				for ( let i = 0; i < labeldata.length; i ++ ) {
 
 					const scale = labeldata[ i ].scale || 1;
 
-					const labelgeo = new THREE.TextBufferGeometry( labeldata[ i ].label, {
+					const labelgeo = new THREE.TextGeometry( labeldata[ i ].label, {
 						font: font,
 						size: labeldata[ i ].size,
 						height: labeldata[ i ].size / 2

examples/webgl_clipping.html

@@ -78,14 +78,14 @@
 
 				} );
 
-				const geometry = new THREE.TorusKnotBufferGeometry( 0.4, 0.08, 95, 20 );
+				const geometry = new THREE.TorusKnotGeometry( 0.4, 0.08, 95, 20 );
 
 				object = new THREE.Mesh( geometry, material );
 				object.castShadow = true;
 				scene.add( object );
 
 				const ground = new THREE.Mesh(
-					new THREE.PlaneBufferGeometry( 9, 9, 1, 1 ),
+					new THREE.PlaneGeometry( 9, 9, 1, 1 ),
 					new THREE.MeshPhongMaterial( { color: 0xa0adaf, shininess: 150 } )
 				);
 

examples/webgl_clipping_advanced.html

@@ -202,7 +202,7 @@
 
 				object = new THREE.Group();
 
-				const geometry = new THREE.BoxBufferGeometry( 0.18, 0.18, 0.18 );
+				const geometry = new THREE.BoxGeometry( 0.18, 0.18, 0.18 );
 
 				for ( let z = - 2; z <= 2; ++ z )
 					for ( let y = - 2; y <= 2; ++ y )
@@ -218,7 +218,7 @@
 				scene.add( object );
 
 
-				const planeGeometry = new THREE.PlaneBufferGeometry( 3, 3, 1, 1 ),
+				const planeGeometry = new THREE.PlaneGeometry( 3, 3, 1, 1 ),
 
 					color = new THREE.Color();