More geometry generator clean up.

editor/examples/arkanoid.app.json

@@ -37,7 +37,7 @@
 		"geometries": [
 			{
 				"uuid": "BBEE74D1-E43D-4C32-A9F3-4656E78C26F3",
-				"type": "PlaneBufferGeometry",
+				"type": "PlaneGeometry",
 				"width": 30,
 				"height": 40,
 				"widthSegments": 1,
@@ -45,7 +45,7 @@
 			},
 			{
 				"uuid": "C1722F5F-89AD-45D8-B78C-D1D34AF2A012",
-				"type": "BoxBufferGeometry",
+				"type": "BoxGeometry",
 				"width": 2,
 				"height": 1,
 				"depth": 1,
@@ -55,7 +55,7 @@
 			},
 			{
 				"uuid": "327EFFCF-649C-4EF3-86D4-B422C5A86E89",
-				"type": "CylinderBufferGeometry",
+				"type": "CylinderGeometry",
 				"radiusTop": 0.5,
 				"radiusBottom": 0.5,
 				"height": 2,
@@ -65,7 +65,7 @@
 			},
 			{
 				"uuid": "0791211B-BB02-4E57-82B5-64C05DE92B39",
-				"type": "SphereBufferGeometry",
+				"type": "SphereGeometry",
 				"radius": 0.5,
 				"widthSegments": 32,
 				"heightSegments": 16,
@@ -76,7 +76,7 @@
 			},
 			{
 				"uuid": "73F12A47-9EA7-47FD-BCF3-89B8219B2626",
-				"type": "BoxBufferGeometry",
+				"type": "BoxGeometry",
 				"width": 2,
 				"height": 1,
 				"depth": 1,
@@ -86,7 +86,7 @@
 			},
 			{
 				"uuid": "3BDEB9FB-BDD4-44AD-8A47-008BED1C8982",
-				"type": "CylinderBufferGeometry",
+				"type": "CylinderGeometry",
 				"radiusTop": 0.5,
 				"radiusBottom": 0.5,
 				"height": 2,

editor/examples/camera.app.json

@@ -37,7 +37,7 @@
 		"geometries": [
 			{
 				"uuid": "6D90C4BE-EBA6-4E21-8F54-7CFDAA61F30B",
-				"type": "PlaneBufferGeometry",
+				"type": "PlaneGeometry",
 				"width": 10,
 				"height": 10,
 				"widthSegments": 1,
@@ -45,7 +45,7 @@
 			},
 			{
 				"uuid": "D3008B2A-ACDD-43CC-87F7-4F942607D21A",
-				"type": "BoxBufferGeometry",
+				"type": "BoxGeometry",
 				"width": 1,
 				"height": 1,
 				"depth": 1,
@@ -55,7 +55,7 @@
 			},
 			{
 				"uuid": "F482ACD4-013A-49CF-AE0F-C9FF4ADAE409",
-				"type": "CylinderBufferGeometry",
+				"type": "CylinderGeometry",
 				"radiusTop": 0,
 				"radiusBottom": 0.4,
 				"height": 0.75,
@@ -65,7 +65,7 @@
 			},
 			{
 				"uuid": "51CDDCED-BC71-4B1B-A485-725B6A48204B",
-				"type": "IcosahedronBufferGeometry",
+				"type": "IcosahedronGeometry",
 				"radius": 0.4,
 				"detail": 2
 			}],

editor/examples/particles.app.json

@@ -37,7 +37,7 @@
 		"geometries": [
 			{
 				"uuid": "C3C0CE7D-10B8-43FC-8F74-011CC6E57800",
-				"type": "PlaneBufferGeometry",
+				"type": "PlaneGeometry",
 				"width": 100,
 				"height": 100,
 				"widthSegments": 1,

editor/examples/pong.app.json

@@ -37,7 +37,7 @@
 		"geometries": [
 			{
 				"uuid": "490CEBA3-6A25-4BE1-B517-C5FB11A5D18A",
-				"type": "PlaneBufferGeometry",
+				"type": "PlaneGeometry",
 				"width": 6,
 				"height": 4,
 				"widthSegments": 1,
@@ -45,7 +45,7 @@
 			},
 			{
 				"uuid": "D9A92F2D-2F08-4851-99C7-12D8D1CA13C7",
-				"type": "BoxBufferGeometry",
+				"type": "BoxGeometry",
 				"width": 0.1,
 				"height": 0.1,
 				"depth": 0.1,
@@ -55,7 +55,7 @@
 			},
 			{
 				"uuid": "5E63B8CF-E225-4ABC-994A-4D06BD4E21EB",
-				"type": "BoxBufferGeometry",
+				"type": "BoxGeometry",
 				"width": 0.2,
 				"height": 0.2,
 				"depth": 1,
@@ -65,7 +65,7 @@
 			},
 			{
 				"uuid": "D61532B4-24C3-4BC4-B56B-7245E8163E09",
-				"type": "BoxBufferGeometry",
+				"type": "BoxGeometry",
 				"width": 0.2,
 				"height": 0.2,
 				"depth": 1,

editor/examples/shaders.app.json

@@ -37,7 +37,7 @@
 		"geometries": [
 			{
 				"uuid": "EA781333-F3AE-470D-9110-A9724FCB42AA",
-				"type": "IcosahedronBufferGeometry",
+				"type": "IcosahedronGeometry",
 				"radius": 1,
 				"detail": 4
 			}],

editor/js/Editor.js

@@ -388,7 +388,7 @@ Editor.prototype = {
 
 	addHelper: function () {
 
-		var geometry = new THREE.SphereBufferGeometry( 2, 4, 2 );
+		var geometry = new THREE.SphereGeometry( 2, 4, 2 );
 		var material = new THREE.MeshBasicMaterial( { color: 0xff0000, visible: false } );
 
 		return function ( object, helper ) {

editor/js/Loader.js

@@ -498,7 +498,7 @@ function Loader( editor ) {
 
 							var shape = shapes[ j ];
 
-							var geometry = new THREE.ShapeBufferGeometry( shape );
+							var geometry = new THREE.ShapeGeometry( shape );
 							var mesh = new THREE.Mesh( geometry, material );
 
 							group.add( mesh );

editor/js/Menubar.Add.js

@@ -46,7 +46,7 @@ function MenubarAdd( editor ) {
 	option.setTextContent( strings.getKey( 'menubar/add/box' ) );
 	option.onClick( function () {
 
-		var geometry = new THREE.BoxBufferGeometry( 1, 1, 1, 1, 1, 1 );
+		var geometry = new THREE.BoxGeometry( 1, 1, 1, 1, 1, 1 );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 		mesh.name = 'Box';
 
@@ -62,7 +62,7 @@ function MenubarAdd( editor ) {
 	option.setTextContent( strings.getKey( 'menubar/add/circle' ) );
 	option.onClick( function () {
 
-		var geometry = new THREE.CircleBufferGeometry( 1, 8, 0, Math.PI * 2 );
+		var geometry = new THREE.CircleGeometry( 1, 8, 0, Math.PI * 2 );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 		mesh.name = 'Circle';
 
@@ -78,7 +78,7 @@ function MenubarAdd( editor ) {
 	option.setTextContent( strings.getKey( 'menubar/add/cylinder' ) );
 	option.onClick( function () {
 
-		var geometry = new THREE.CylinderBufferGeometry( 1, 1, 1, 8, 1, false, 0, Math.PI * 2 );
+		var geometry = new THREE.CylinderGeometry( 1, 1, 1, 8, 1, false, 0, Math.PI * 2 );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 		mesh.name = 'Cylinder';
 
@@ -94,7 +94,7 @@ function MenubarAdd( editor ) {
 	option.setTextContent( strings.getKey( 'menubar/add/dodecahedron' ) );
 	option.onClick( function () {
 
-		var geometry = new THREE.DodecahedronBufferGeometry( 1, 0 );
+		var geometry = new THREE.DodecahedronGeometry( 1, 0 );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 		mesh.name = 'Dodecahedron';
 
@@ -110,7 +110,7 @@ function MenubarAdd( editor ) {
 	option.setTextContent( strings.getKey( 'menubar/add/icosahedron' ) );
 	option.onClick( function () {
 
-		var geometry = new THREE.IcosahedronBufferGeometry( 1, 0 );
+		var geometry = new THREE.IcosahedronGeometry( 1, 0 );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 		mesh.name = 'Icosahedron';
 
@@ -140,7 +140,7 @@ function MenubarAdd( editor ) {
 			new THREE.Vector2( 0.3, 1.2 )
 		];
 
-		var geometry = new THREE.LatheBufferGeometry( points, 12, 0, Math.PI * 2 );
+		var geometry = new THREE.LatheGeometry( points, 12, 0, Math.PI * 2 );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial( { side: THREE.DoubleSide } ) );
 		mesh.name = 'Lathe';
 
@@ -156,7 +156,7 @@ function MenubarAdd( editor ) {
 	option.setTextContent( strings.getKey( 'menubar/add/octahedron' ) );
 	option.onClick( function () {
 
-		var geometry = new THREE.OctahedronBufferGeometry( 1, 0 );
+		var geometry = new THREE.OctahedronGeometry( 1, 0 );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 		mesh.name = 'Octahedron';
 
@@ -172,7 +172,7 @@ function MenubarAdd( editor ) {
 	option.setTextContent( strings.getKey( 'menubar/add/plane' ) );
 	option.onClick( function () {
 
-		var geometry = new THREE.PlaneBufferGeometry( 1, 1, 1, 1 );
+		var geometry = new THREE.PlaneGeometry( 1, 1, 1, 1 );
 		var material = new THREE.MeshStandardMaterial();
 		var mesh = new THREE.Mesh( geometry, material );
 		mesh.name = 'Plane';
@@ -189,7 +189,7 @@ function MenubarAdd( editor ) {
 	option.setTextContent( strings.getKey( 'menubar/add/ring' ) );
 	option.onClick( function () {
 
-		var geometry = new THREE.RingBufferGeometry( 0.5, 1, 8, 1, 0, Math.PI * 2 );
+		var geometry = new THREE.RingGeometry( 0.5, 1, 8, 1, 0, Math.PI * 2 );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 		mesh.name = 'Ring';
 
@@ -205,7 +205,7 @@ function MenubarAdd( editor ) {
 	option.setTextContent( strings.getKey( 'menubar/add/sphere' ) );
 	option.onClick( function () {
 
-		var geometry = new THREE.SphereBufferGeometry( 1, 8, 6, 0, Math.PI * 2, 0, Math.PI );
+		var geometry = new THREE.SphereGeometry( 1, 8, 6, 0, Math.PI * 2, 0, Math.PI );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 		mesh.name = 'Sphere';
 
@@ -236,7 +236,7 @@ function MenubarAdd( editor ) {
 	option.setTextContent( strings.getKey( 'menubar/add/tetrahedron' ) );
 	option.onClick( function () {
 
-		var geometry = new THREE.TetrahedronBufferGeometry( 1, 0 );
+		var geometry = new THREE.TetrahedronGeometry( 1, 0 );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 		mesh.name = 'Tetrahedron';
 
@@ -252,7 +252,7 @@ function MenubarAdd( editor ) {
 	option.setTextContent( strings.getKey( 'menubar/add/torus' ) );
 	option.onClick( function () {
 
-		var geometry = new THREE.TorusBufferGeometry( 1, 0.4, 8, 6, Math.PI * 2 );
+		var geometry = new THREE.TorusGeometry( 1, 0.4, 8, 6, Math.PI * 2 );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 		mesh.name = 'Torus';
 
@@ -268,7 +268,7 @@ function MenubarAdd( editor ) {
 	option.setTextContent( strings.getKey( 'menubar/add/torusknot' ) );
 	option.onClick( function () {
 
-		var geometry = new THREE.TorusKnotBufferGeometry( 1, 0.4, 64, 8, 2, 3 );
+		var geometry = new THREE.TorusKnotGeometry( 1, 0.4, 64, 8, 2, 3 );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 		mesh.name = 'TorusKnot';
 
@@ -291,7 +291,7 @@ function MenubarAdd( editor ) {
 			new THREE.Vector3( - 2, 2, 2 )
 		] );
 
-		var geometry = new THREE.TubeBufferGeometry( path, 64, 1, 8, false );
+		var geometry = new THREE.TubeGeometry( path, 64, 1, 8, false );
 		var mesh = new THREE.Mesh( geometry, new THREE.MeshStandardMaterial() );
 		mesh.name = 'Tube';
 
@@ -318,7 +318,7 @@ function MenubarAdd( editor ) {
 
 		var material = new THREE.MeshStandardMaterial();
 
-		var geometry = new TeapotBufferGeometry( size, segments, bottom, lid, body, fitLid, blinnScale );
+		var geometry = new TeapotGeometry( size, segments, bottom, lid, body, fitLid, blinnScale );
 		var mesh = new THREE.Mesh( geometry, material );
 		mesh.name = 'Teapot';
 

editor/js/Sidebar.Geometry.BoxBufferGeometry.js → editor/js/Sidebar.Geometry.BoxGeometry.js

@@ -77,7 +77,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.BoxBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.BoxGeometry(
 			width.getValue(),
 			height.getValue(),
 			depth.getValue(),

editor/js/Sidebar.Geometry.CircleBufferGeometry.js → editor/js/Sidebar.Geometry.CircleGeometry.js

@@ -57,7 +57,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.CircleBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.CircleGeometry(
 			radius.getValue(),
 			segments.getValue(),
 			thetaStart.getValue() * THREE.MathUtils.DEG2RAD,

editor/js/Sidebar.Geometry.CylinderBufferGeometry.js → editor/js/Sidebar.Geometry.CylinderGeometry.js

@@ -77,7 +77,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.CylinderBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.CylinderGeometry(
 			radiusTop.getValue(),
 			radiusBottom.getValue(),
 			height.getValue(),

editor/js/Sidebar.Geometry.DodecahedronBufferGeometry.js → editor/js/Sidebar.Geometry.DodecahedronGeometry.js

@@ -37,7 +37,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.DodecahedronBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.DodecahedronGeometry(
 			radius.getValue(),
 			detail.getValue()
 		) ) );

editor/js/Sidebar.Geometry.ExtrudeBufferGeometry.js → editor/js/Sidebar.Geometry.ExtrudeGeometry.js

@@ -113,7 +113,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.ExtrudeBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.ExtrudeGeometry(
 			parameters.shapes,
 			{
 				curveSegments: curveSegments.getValue(),
@@ -131,7 +131,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function toShape() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.ShapeBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.ShapeGeometry(
 			parameters.shapes,
 			options.curveSegments
 		) ) );

editor/js/Sidebar.Geometry.IcosahedronBufferGeometry.js → editor/js/Sidebar.Geometry.IcosahedronGeometry.js

@@ -39,7 +39,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.IcosahedronBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.IcosahedronGeometry(
 			radius.getValue(),
 			detail.getValue()
 		) ) );

editor/js/Sidebar.Geometry.LatheBufferGeometry.js → editor/js/Sidebar.Geometry.LatheGeometry.js

@@ -56,7 +56,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.LatheBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.LatheGeometry(
 			points.getValue(),
 			segments.getValue(),
 			phiStart.getValue() / 180 * Math.PI,

editor/js/Sidebar.Geometry.OctahedronBufferGeometry.js → editor/js/Sidebar.Geometry.OctahedronGeometry.js

@@ -40,7 +40,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.OctahedronBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.OctahedronGeometry(
 			radius.getValue(),
 			detail.getValue()
 		) ) );

editor/js/Sidebar.Geometry.PlaneBufferGeometry.js → editor/js/Sidebar.Geometry.PlaneGeometry.js

@@ -58,7 +58,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.PlaneBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.PlaneGeometry(
 			width.getValue(),
 			height.getValue(),
 			widthSegments.getValue(),

editor/js/Sidebar.Geometry.RingBufferGeometry.js → editor/js/Sidebar.Geometry.RingGeometry.js

@@ -77,7 +77,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.RingBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.RingGeometry(
 			innerRadius.getValue(),
 			outerRadius.getValue(),
 			thetaSegments.getValue(),

editor/js/Sidebar.Geometry.ShapeBufferGeometry.js → editor/js/Sidebar.Geometry.ShapeGeometry.js

@@ -31,7 +31,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function changeShape() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.ShapeBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.ShapeGeometry(
 			parameters.shapes,
 			curveSegments.getValue()
 		) ) );
@@ -40,7 +40,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function toExtrude() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.ExtrudeBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.ExtrudeGeometry(
 			parameters.shapes, {
 				curveSegments: curveSegments.getValue()
 			}

editor/js/Sidebar.Geometry.SphereBufferGeometry.js → editor/js/Sidebar.Geometry.SphereGeometry.js

@@ -88,7 +88,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.SphereBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.SphereGeometry(
 			radius.getValue(),
 			widthSegments.getValue(),
 			heightSegments.getValue(),

editor/js/Sidebar.Geometry.TeapotBufferGeometry.js → editor/js/Sidebar.Geometry.TeapotGeometry.js

@@ -1,6 +1,6 @@
 import { UIRow, UIText, UIInteger, UICheckbox, UINumber } from './libs/ui.js';
 
-import { TeapotBufferGeometry } from '../../examples/jsm/geometries/TeapotBufferGeometry.js';
+import { TeapotGeometry } from '../../examples/jsm/geometries/TeapotGeometry.js';
 
 function GeometryParametersPanel( signals, object ) {
 
@@ -82,7 +82,7 @@ function GeometryParametersPanel( signals, object ) {
 
 		object.geometry.dispose();
 
-		object.geometry = new TeapotBufferGeometry(
+		object.geometry = new TeapotGeometry(
 			size.getValue(),
 			segments.getValue(),
 			bottom.getValue(),

editor/js/Sidebar.Geometry.TetrahedronBufferGeometry.js → editor/js/Sidebar.Geometry.TetrahedronGeometry.js

@@ -40,7 +40,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.TetrahedronBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.TetrahedronGeometry(
 			radius.getValue(),
 			detail.getValue()
 		) ) );

editor/js/Sidebar.Geometry.TorusBufferGeometry.js → editor/js/Sidebar.Geometry.TorusGeometry.js

@@ -68,7 +68,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.TorusBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.TorusGeometry(
 			radius.getValue(),
 			tube.getValue(),
 			radialSegments.getValue(),

editor/js/Sidebar.Geometry.TorusKnotBufferGeometry.js → editor/js/Sidebar.Geometry.TorusKnotGeometry.js

@@ -78,7 +78,7 @@ function GeometryParametersPanel( editor, object ) {
 
 	function update() {
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.TorusKnotBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.TorusKnotGeometry(
 			radius.getValue(),
 			tube.getValue(),
 			tubularSegments.getValue(),

editor/js/Sidebar.Geometry.TubeBufferGeometry.js → editor/js/Sidebar.Geometry.TubeGeometry.js

@@ -88,7 +88,7 @@ function GeometryParametersPanel( editor, object ) {
 
 		tensionRow.setDisplay( curveType.getValue() == 'catmullrom' ? '' : 'none' );
 
-		editor.execute( new SetGeometryCommand( editor, object, new THREE.TubeBufferGeometry(
+		editor.execute( new SetGeometryCommand( editor, object, new THREE.TubeGeometry(
 			new THREE.CatmullRomCurve3( points.getValue(), closed.getValue(), curveType.getValue(), tension.getValue() ),
 			tubularSegments.getValue(),
 			radius.getValue(),

editor/js/Viewport.ViewHelper.js

@@ -47,7 +47,7 @@ function ViewHelper( editorCamera, container ) {
 	var camera = new THREE.OrthographicCamera( - 2, 2, 2, - 2, 0, 4 );
 	camera.position.set( 0, 0, 2 );
 
-	var geometry = new THREE.BoxBufferGeometry( 0.8, 0.05, 0.05 ).translate( 0.4, 0, 0 );
+	var geometry = new THREE.BoxGeometry( 0.8, 0.05, 0.05 ).translate( 0.4, 0, 0 );
 
 	var xAxis = new THREE.Mesh( geometry, getAxisMaterial( color1 ) );
 	var yAxis = new THREE.Mesh( geometry, getAxisMaterial( color2 ) );

editor/js/libs/ui.three.js

@@ -943,7 +943,7 @@ function renderToCanvas( texture ) {
 	var camera = new THREE.OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
 
 	var material = new THREE.MeshBasicMaterial( { map: texture } );
-	var quad = new THREE.PlaneBufferGeometry( 2, 2 );
+	var quad = new THREE.PlaneGeometry( 2, 2 );
 	var mesh = new THREE.Mesh( quad, material );
 	scene.add( mesh );
 

editor/sw.js

@@ -61,7 +61,7 @@ const assets = [
 
 	'../examples/jsm/helpers/VertexNormalsHelper.js',
 
-	'../examples/jsm/geometries/TeapotBufferGeometry.js',
+	'../examples/jsm/geometries/TeapotGeometry.js',
 
 	'../examples/jsm/webxr/VRButton.js',
 
@@ -140,23 +140,23 @@ const assets = [
 	'./js/Sidebar.Geometry.Geometry.js',
 	'./js/Sidebar.Geometry.BufferGeometry.js',
 	'./js/Sidebar.Geometry.Modifiers.js',
-	'./js/Sidebar.Geometry.BoxBufferGeometry.js',
-	'./js/Sidebar.Geometry.CircleBufferGeometry.js',
-	'./js/Sidebar.Geometry.CylinderBufferGeometry.js',
-	'./js/Sidebar.Geometry.DodecahedronBufferGeometry.js',
-	'./js/Sidebar.Geometry.ExtrudeBufferGeometry.js',
-	'./js/Sidebar.Geometry.IcosahedronBufferGeometry.js',
-	'./js/Sidebar.Geometry.LatheBufferGeometry.js',
-	'./js/Sidebar.Geometry.OctahedronBufferGeometry.js',
-	'./js/Sidebar.Geometry.PlaneBufferGeometry.js',
-	'./js/Sidebar.Geometry.RingBufferGeometry.js',
-	'./js/Sidebar.Geometry.SphereBufferGeometry.js',
-	'./js/Sidebar.Geometry.ShapeBufferGeometry.js',
-	'./js/Sidebar.Geometry.TetrahedronBufferGeometry.js',
-	'./js/Sidebar.Geometry.TorusBufferGeometry.js',
-	'./js/Sidebar.Geometry.TorusKnotBufferGeometry.js',
-	'./js/Sidebar.Geometry.TubeBufferGeometry.js',
-	'./js/Sidebar.Geometry.TeapotBufferGeometry.js',
+	'./js/Sidebar.Geometry.BoxGeometry.js',
+	'./js/Sidebar.Geometry.CircleGeometry.js',
+	'./js/Sidebar.Geometry.CylinderGeometry.js',
+	'./js/Sidebar.Geometry.DodecahedronGeometry.js',
+	'./js/Sidebar.Geometry.ExtrudeGeometry.js',
+	'./js/Sidebar.Geometry.IcosahedronGeometry.js',
+	'./js/Sidebar.Geometry.LatheGeometry.js',
+	'./js/Sidebar.Geometry.OctahedronGeometry.js',
+	'./js/Sidebar.Geometry.PlaneGeometry.js',
+	'./js/Sidebar.Geometry.RingGeometry.js',
+	'./js/Sidebar.Geometry.SphereGeometry.js',
+	'./js/Sidebar.Geometry.ShapeGeometry.js',
+	'./js/Sidebar.Geometry.TetrahedronGeometry.js',
+	'./js/Sidebar.Geometry.TorusGeometry.js',
+	'./js/Sidebar.Geometry.TorusKnotGeometry.js',
+	'./js/Sidebar.Geometry.TubeGeometry.js',
+	'./js/Sidebar.Geometry.TeapotGeometry.js',
 	'./js/Sidebar.Material.js',
 	'./js/Sidebar.Animation.js',
 	'./js/Sidebar.Script.js',

examples/js/geometries/TeapotBufferGeometry.js → examples/js/geometries/TeapotGeometry.js

@@ -47,7 +47,7 @@
  *
  */
 
-THREE.TeapotBufferGeometry = function ( size, segments, bottom, lid, body, fitLid, blinn ) {
+THREE.TeapotGeometry = function ( size, segments, bottom, lid, body, fitLid, blinn ) {
 
 	// 32 * 4 * 4 Bezier spline patches
 	var teapotPatches = [
@@ -710,5 +710,5 @@ THREE.TeapotBufferGeometry = function ( size, segments, bottom, lid, body, fitLi
 };
 
 
-THREE.TeapotBufferGeometry.prototype = Object.create( THREE.BufferGeometry.prototype );
-THREE.TeapotBufferGeometry.prototype.constructor = THREE.TeapotBufferGeometry;
+THREE.TeapotGeometry.prototype = Object.create( THREE.BufferGeometry.prototype );
+THREE.TeapotGeometry.prototype.constructor = THREE.TeapotGeometry;

examples/jsm/geometries/TeapotBufferGeometry.d.ts → examples/jsm/geometries/TeapotGeometry.d.ts

@@ -2,7 +2,7 @@ import {
 	BufferGeometry
 } from '../../../src/Three';
 
-export class TeapotBufferGeometry extends BufferGeometry {
+export class TeapotGeometry extends BufferGeometry {
 
 	constructor( size?: number, segments?: number, bottom?: boolean, lid?: boolean, body?: boolean, fitLid?: boolean, blinn?: number );
 

examples/jsm/geometries/TeapotBufferGeometry.js → examples/jsm/geometries/TeapotGeometry.js

@@ -55,7 +55,7 @@ import {
  *
  */
 
-var TeapotBufferGeometry = function ( size, segments, bottom, lid, body, fitLid, blinn ) {
+var TeapotGeometry = function ( size, segments, bottom, lid, body, fitLid, blinn ) {
 
 	// 32 * 4 * 4 Bezier spline patches
 	var teapotPatches = [
@@ -718,7 +718,7 @@ var TeapotBufferGeometry = function ( size, segments, bottom, lid, body, fitLid,
 };
 
 
-TeapotBufferGeometry.prototype = Object.create( BufferGeometry.prototype );
-TeapotBufferGeometry.prototype.constructor = TeapotBufferGeometry;
+TeapotGeometry.prototype = Object.create( BufferGeometry.prototype );
+TeapotGeometry.prototype.constructor = TeapotGeometry;
 
-export { TeapotBufferGeometry };
+export { TeapotGeometry };

examples/misc_exporter_collada.html

@@ -20,7 +20,7 @@
 
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
 			import { ColladaExporter } from './jsm/exporters/ColladaExporter.js';
-			import { TeapotBufferGeometry } from './jsm/geometries/TeapotBufferGeometry.js';
+			import { TeapotGeometry } from './jsm/geometries/TeapotGeometry.js';
 
 			////////////////////////////////////////////////////////////////////////////////
 			// Utah/Newell Teapot demo
@@ -327,7 +327,7 @@
 
 				}
 
-				const teapotGeometry = new TeapotBufferGeometry( teapotSize,
+				const teapotGeometry = new TeapotGeometry( teapotSize,
 					tess,
 					effectController.bottom,
 					effectController.lid,

examples/webgl_buffergeometry_compression.html

@@ -20,7 +20,7 @@
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
 			import { GeometryCompressionUtils } from './jsm/utils/GeometryCompressionUtils.js';
 			import { BufferGeometryUtils } from './jsm/utils/BufferGeometryUtils.js';
-			import { TeapotBufferGeometry } from './jsm/geometries/TeapotBufferGeometry.js';
+			import { TeapotGeometry } from './jsm/geometries/TeapotGeometry.js';
 			import { GUI } from './jsm/libs/dat.gui.module.js';
 
 			const statsEnabled = true;
@@ -129,7 +129,7 @@
 						case "Cylinder":
 							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 );
+							return new TeapotGeometry( radius, data.detail * 3, true, true, true, true, true );
 						case "TorusKnot":
 							return new THREE.TorusKnotGeometry( radius, 10, data.detail * 20, data.detail * 6, 3, 4 );
 

examples/webgl_geometry_teapot.html

@@ -19,7 +19,7 @@
 			import { GUI } from './jsm/libs/dat.gui.module.js';
 
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
-			import { TeapotBufferGeometry } from './jsm/geometries/TeapotBufferGeometry.js';
+			import { TeapotGeometry } from './jsm/geometries/TeapotGeometry.js';
 
 			let camera, scene, renderer;
 			let cameraControls;
@@ -306,7 +306,7 @@
 
 				}
 
-				const teapotGeometry = new TeapotBufferGeometry( teapotSize,
+				const teapotGeometry = new TeapotGeometry( teapotSize,
 					tess,
 					effectController.bottom,
 					effectController.lid,

examples/webgl_loader_nodes.html

@@ -21,7 +21,7 @@
 				import { GUI } from './jsm/libs/dat.gui.module.js';
 				import { OrbitControls } from './jsm/controls/OrbitControls.js';
 				import { NodeMaterialLoader } from './jsm/loaders/NodeMaterialLoader.js';
-				import { TeapotBufferGeometry } from './jsm/geometries/TeapotBufferGeometry.js';
+				import { TeapotGeometry } from './jsm/geometries/TeapotGeometry.js';
 				import { NodeFrame } from './jsm/nodes/core/NodeFrame.js';
 				import { NodeMaterial } from './jsm/nodes/materials/NodeMaterial.js';
 
@@ -69,7 +69,7 @@
 					light2.position.set( - 1, 0.75, - 0.5 );
 					scene.add( light2 );
 
-					teapot = new TeapotBufferGeometry( 15, 18 );
+					teapot = new TeapotGeometry( 15, 18 );
 
 					mesh = new THREE.Mesh( teapot );
 					scene.add( mesh );

examples/webgl_materials_compile.html

@@ -38,7 +38,7 @@
 			import * as THREE from '../build/three.module.js';
 
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
-			import { TeapotBufferGeometry } from './jsm/geometries/TeapotBufferGeometry.js';
+			import { TeapotGeometry } from './jsm/geometries/TeapotGeometry.js';
 
 			import {
 				NodeFrame,
@@ -109,7 +109,7 @@
 				light2.position.set( - 1, 0.75, - 0.5 );
 				scene.add( light2 );
 
-				teapot = new TeapotBufferGeometry( 15, 18 );
+				teapot = new TeapotGeometry( 15, 18 );
 
 				const itemsonrow = 10;
 

examples/webgl_materials_nodes.html

@@ -21,7 +21,7 @@
 			import { GUI } from './jsm/libs/dat.gui.module.js';
 			import { OrbitControls } from './jsm/controls/OrbitControls.js';
 
-			import { TeapotBufferGeometry } from './jsm/geometries/TeapotBufferGeometry.js';
+			import { TeapotGeometry } from './jsm/geometries/TeapotGeometry.js';
 
 			import { NodeMaterialLoader, NodeMaterialLoaderUtils } from './jsm/loaders/NodeMaterialLoader.js';
 
@@ -148,7 +148,7 @@
 				light.position.set( - 1, 0.75, - 0.5 );
 				lightGroup.add( light );
 
-				teapot = new TeapotBufferGeometry( 15, 18 );
+				teapot = new TeapotGeometry( 15, 18 );
 
 				mesh = new THREE.Mesh( teapot );
 				scene.add( mesh );

utils/modularize.js

@@ -47,7 +47,7 @@ var files = [
 	{ path: 'geometries/DecalGeometry.js', dependencies: [], ignoreList: [ 'Geometry' ] },
 	{ path: 'geometries/LightningStrike.js', dependencies: [ { name: 'SimplexNoise', path: 'math/SimplexNoise.js' } ], ignoreList: [ 'Mesh' ] },
 	{ path: 'geometries/ParametricGeometries.js', dependencies: [], ignoreList: [] },
-	{ path: 'geometries/TeapotBufferGeometry.js', dependencies: [], ignoreList: [] },
+	{ path: 'geometries/TeapotGeometry.js', dependencies: [], ignoreList: [] },
 
 	{ path: 'interactive/SelectionBox.js', dependencies: [], ignoreList: [] },
 	{ path: 'interactive/SelectionHelper.js', dependencies: [], ignoreList: [] },