Explorar o código

Deprecate legacy BufferGeometry nomenclature for built-in geometries (#24352)

* Deprecate legacy nomenclature

* Update revision number
WestLangley %!s(int64=3) %!d(string=hai) anos
pai
achega
5acd8ce2cf
Modificáronse 39 ficheiros con 311 adicións e 60 borrados
  1. 269 0
      src/Three.Legacy.js
  2. 1 1
      src/geometries/BoxGeometry.js
  3. 1 1
      src/geometries/CapsuleGeometry.js
  4. 1 1
      src/geometries/CircleGeometry.js
  5. 1 1
      src/geometries/ConeGeometry.js
  6. 1 1
      src/geometries/CylinderGeometry.js
  7. 1 1
      src/geometries/DodecahedronGeometry.js
  8. 1 1
      src/geometries/ExtrudeGeometry.js
  9. 1 1
      src/geometries/IcosahedronGeometry.js
  10. 1 1
      src/geometries/LatheGeometry.js
  11. 1 1
      src/geometries/OctahedronGeometry.js
  12. 1 1
      src/geometries/PlaneGeometry.js
  13. 1 1
      src/geometries/PolyhedronGeometry.js
  14. 1 1
      src/geometries/RingGeometry.js
  15. 1 1
      src/geometries/ShapeGeometry.js
  16. 1 1
      src/geometries/SphereGeometry.js
  17. 1 1
      src/geometries/TetrahedronGeometry.js
  18. 1 1
      src/geometries/TorusGeometry.js
  19. 1 1
      src/geometries/TorusKnotGeometry.js
  20. 1 1
      src/geometries/TubeGeometry.js
  21. 1 2
      test/unit/src/geometries/BoxGeometry.tests.js
  22. 1 2
      test/unit/src/geometries/CapsuleGeometry.tests.js
  23. 1 2
      test/unit/src/geometries/CircleGeometry.tests.js
  24. 1 2
      test/unit/src/geometries/ConeGeometry.tests.js
  25. 1 2
      test/unit/src/geometries/CylinderGeometry.tests.js
  26. 2 3
      test/unit/src/geometries/DodecahedronGeometry.tests.js
  27. 1 2
      test/unit/src/geometries/IcosahedronGeometry.tests.js
  28. 1 2
      test/unit/src/geometries/LatheGeometry.tests.js
  29. 1 2
      test/unit/src/geometries/OctahedronGeometry.tests.js
  30. 1 2
      test/unit/src/geometries/PlaneGeometry.tests.js
  31. 1 2
      test/unit/src/geometries/PolyhedronGeometry.tests.js
  32. 1 2
      test/unit/src/geometries/RingGeometry.tests.js
  33. 1 2
      test/unit/src/geometries/ShapeGeometry.tests.js
  34. 1 2
      test/unit/src/geometries/SphereGeometry.tests.js
  35. 1 2
      test/unit/src/geometries/TetrahedronGeometry.tests.js
  36. 2 3
      test/unit/src/geometries/TorusGeometry.tests.js
  37. 1 2
      test/unit/src/geometries/TorusKnotGeometry.tests.js
  38. 1 2
      test/unit/src/geometries/TubeGeometry.tests.js
  39. 3 3
      test/unit/src/math/Box3.tests.js

+ 269 - 0
src/Three.Legacy.js

@@ -1,6 +1,25 @@
 import { WebGLRenderTarget } from './renderers/WebGLRenderTarget.js';
 import { WebGLRenderTarget } from './renderers/WebGLRenderTarget.js';
 import { DataArrayTexture } from './textures/DataArrayTexture.js';
 import { DataArrayTexture } from './textures/DataArrayTexture.js';
 import { Data3DTexture } from './textures/Data3DTexture.js';
 import { Data3DTexture } from './textures/Data3DTexture.js';
+import { BoxGeometry } from './geometries/BoxGeometry.js';
+import { CapsuleGeometry } from './geometries/CapsuleGeometry.js';
+import { CircleGeometry } from './geometries/CircleGeometry.js';
+import { ConeGeometry } from './geometries/ConeGeometry.js';
+import { CylinderGeometry } from './geometries/CylinderGeometry.js';
+import { DodecahedronGeometry } from './geometries/DodecahedronGeometry.js';
+import { ExtrudeGeometry } from './geometries/ExtrudeGeometry.js';
+import { IcosahedronGeometry } from './geometries/IcosahedronGeometry.js';
+import { LatheGeometry } from './geometries/LatheGeometry.js';
+import { OctahedronGeometry } from './geometries/OctahedronGeometry.js';
+import { PlaneGeometry } from './geometries/PlaneGeometry.js';
+import { PolyhedronGeometry } from './geometries/PolyhedronGeometry.js';
+import { RingGeometry } from './geometries/RingGeometry.js';
+import { ShapeGeometry } from './geometries/ShapeGeometry.js';
+import { SphereGeometry } from './geometries/SphereGeometry.js';
+import { TetrahedronGeometry } from './geometries/TetrahedronGeometry.js';
+import { TorusGeometry } from './geometries/TorusGeometry.js';
+import { TorusKnotGeometry } from './geometries/TorusKnotGeometry.js';
+import { TubeGeometry } from './geometries/TubeGeometry.js';
 
 
 // r134, d65e0af06644fe5a84a6fc0e372f4318f95a04c0
 // r134, d65e0af06644fe5a84a6fc0e372f4318f95a04c0
 
 
@@ -49,3 +68,253 @@ export class DataTexture3D extends Data3DTexture {
 	}
 	}
 
 
 }
 }
+
+// r144
+
+export class BoxBufferGeometry extends BoxGeometry {
+
+	constructor( width, height, depth, widthSegments, heightSegments, depthSegments ) {
+
+		console.warn( 'THREE.BoxBufferGeometry has been renamed to THREE.BoxGeometry.' );
+		super( width, height, depth, widthSegments, heightSegments, depthSegments );
+
+
+	}
+
+}
+
+// r144
+
+export class CapsuleBufferGeometry extends CapsuleGeometry {
+
+	constructor( radius, length, capSegments, radialSegments ) {
+
+		console.warn( 'THREE.CapsuleBufferGeometry has been renamed to THREE.CapsuleGeometry.' );
+		super( radius, length, capSegments, radialSegments );
+
+	}
+
+}
+
+// r144
+
+export class CircleBufferGeometry extends CircleGeometry {
+
+	constructor( radius, segments, thetaStart, thetaLength ) {
+
+		console.warn( 'THREE.CircleBufferGeometry has been renamed to THREE.CircleGeometry.' );
+		super( radius, segments, thetaStart, thetaLength );
+
+	}
+
+}
+
+// r144
+
+export class ConeBufferGeometry extends ConeGeometry {
+
+	constructor( radius, height, radialSegments, heightSegments, openEnded, thetaStart, thetaLength ) {
+
+		console.warn( 'THREE.ConeBufferGeometry has been renamed to THREE.ConeGeometry.' );
+		super( radius, height, radialSegments, heightSegments, openEnded, thetaStart, thetaLength );
+
+	}
+
+}
+
+// r144
+
+export class CylinderBufferGeometry extends CylinderGeometry {
+
+	constructor( radiusTop, radiusBottom, height, radialSegments, heightSegments, openEnded, thetaStart, thetaLength ) {
+
+		console.warn( 'THREE.CylinderBufferGeometry has been renamed to THREE.CylinderGeometry.' );
+		super( radiusTop, radiusBottom, height, radialSegments, heightSegments, openEnded, thetaStart, thetaLength );
+
+	}
+
+}
+
+// r144
+
+export class DodecahedronBufferGeometry extends DodecahedronGeometry {
+
+	constructor( radius, detail ) {
+
+		console.warn( 'THREE.DodecahedronBufferGeometry has been renamed to THREE.DodecahedronGeometry.' );
+		super( radius, detail );
+
+	}
+
+}
+
+// r144
+
+export class ExtrudeBufferGeometry extends ExtrudeGeometry {
+
+	constructor( shapes, options ) {
+
+		console.warn( 'THREE.ExtrudeBufferGeometry has been renamed to THREE.ExtrudeGeometry.' );
+		super( shapes, options );
+
+	}
+
+}
+
+// r144
+
+export class IcosahedronBufferGeometry extends IcosahedronGeometry {
+
+	constructor( radius, detail ) {
+
+		console.warn( 'THREE.IcosahedronBufferGeometry has been renamed to THREE.IcosahedronGeometry.' );
+		super( radius, detail );
+
+	}
+
+}
+
+// r144
+
+export class LatheBufferGeometry extends LatheGeometry {
+
+	constructor( points, segments, phiStart, phiLength ) {
+
+		console.warn( 'THREE.LatheBufferGeometry has been renamed to THREE.LatheGeometry.' );
+		super( points, segments, phiStart, phiLength );
+
+	}
+
+}
+
+// r144
+
+export class OctahedronBufferGeometry extends OctahedronGeometry {
+
+	constructor( radius, detail ) {
+
+		console.warn( 'THREE.OctahedronBufferGeometry has been renamed to THREE.OctahedronGeometry.' );
+		super( radius, detail );
+
+	}
+
+}
+
+// r144
+
+export class PlaneBufferGeometry extends PlaneGeometry {
+
+	constructor( width, height, widthSegments, heightSegments ) {
+
+		console.warn( 'THREE.PlaneBufferGeometry has been renamed to THREE.PlaneGeometry.' );
+		super( width, height, widthSegments, heightSegments );
+
+	}
+
+}
+
+// r144
+
+export class PolyhedronBufferGeometry extends PolyhedronGeometry {
+
+	constructor( vertices, indices, radius, detail ) {
+
+		console.warn( 'THREE.PolyhedronBufferGeometry has been renamed to THREE.PolyhedronGeometry.' );
+		super( vertices, indices, radius, detail );
+
+	}
+
+}
+
+// r144
+
+export class RingBufferGeometry extends RingGeometry {
+
+	constructor( innerRadius, outerRadius, thetaSegments, phiSegments, thetaStart, thetaLength ) {
+
+		console.warn( 'THREE.RingBufferGeometry has been renamed to THREE.RingGeometry.' );
+		super( innerRadius, outerRadius, thetaSegments, phiSegments, thetaStart, thetaLength );
+
+	}
+
+}
+
+// r144
+
+export class ShapeBufferGeometry extends ShapeGeometry {
+
+	constructor( shapes, curveSegments ) {
+
+		console.warn( 'THREE.ShapeBufferGeometry has been renamed to THREE.ShapeGeometry.' );
+		super( shapes, curveSegments );
+
+	}
+
+}
+
+// r144
+
+export class SphereBufferGeometry extends SphereGeometry {
+
+	constructor( radius, widthSegments, heightSegments, phiStart, phiLength, thetaStart, thetaLength ) {
+
+		console.warn( 'THREE.SphereBufferGeometry has been renamed to THREE.SphereGeometry.' );
+		super( radius, widthSegments, heightSegments, phiStart, phiLength, thetaStart, thetaLength );
+
+	}
+
+}
+
+// r144
+
+export class TetrahedronBufferGeometry extends TetrahedronGeometry {
+
+	constructor( radius, detail ) {
+
+		console.warn( 'THREE.TetrahedronBufferGeometry has been renamed to THREE.TetrahedronGeometry.' );
+		super( radius, detail );
+
+	}
+
+}
+
+// r144
+
+export class TorusBufferGeometry extends TorusGeometry {
+
+	constructor( radius, tube, radialSegments, tubularSegments, arc ) {
+
+		console.warn( 'THREE.TorusBufferGeometry has been renamed to THREE.TorusGeometry.' );
+		super( radius, tube, radialSegments, tubularSegments, arc );
+
+	}
+
+}
+
+// r144
+
+export class TorusKnotBufferGeometry extends TorusKnotGeometry {
+
+	constructor( radius, tube, tubularSegments, radialSegments, p, q ) {
+
+		console.warn( 'THREE.TorusKnotBufferGeometry has been renamed to THREE.TorusKnotGeometry.' );
+		super( radius, tube, tubularSegments, radialSegments, p, q );
+
+	}
+
+}
+
+// r144
+
+export class TubeBufferGeometry extends TubeGeometry {
+
+	constructor( path, tubularSegments, radius, radialSegments, closed ) {
+
+		console.warn( 'THREE.TubeBufferGeometry has been renamed to THREE.TubeGeometry.' );
+		super( path, tubularSegments, radius, radialSegments, closed );
+
+	}
+
+}
+
+

+ 1 - 1
src/geometries/BoxGeometry.js

@@ -167,4 +167,4 @@ class BoxGeometry extends BufferGeometry {
 
 
 }
 }
 
 
-export { BoxGeometry, BoxGeometry as BoxBufferGeometry };
+export { BoxGeometry };

+ 1 - 1
src/geometries/CapsuleGeometry.js

@@ -30,4 +30,4 @@ class CapsuleGeometry extends LatheGeometry {
 
 
 }
 }
 
 
-export { CapsuleGeometry, CapsuleGeometry as CapsuleBufferGeometry };
+export { CapsuleGeometry };

+ 1 - 1
src/geometries/CircleGeometry.js

@@ -88,4 +88,4 @@ class CircleGeometry extends BufferGeometry {
 }
 }
 
 
 
 
-export { CircleGeometry, CircleGeometry as CircleBufferGeometry };
+export { CircleGeometry };

+ 1 - 1
src/geometries/ConeGeometry.js

@@ -28,4 +28,4 @@ class ConeGeometry extends CylinderGeometry {
 
 
 }
 }
 
 
-export { ConeGeometry, ConeGeometry as ConeBufferGeometry };
+export { ConeGeometry };

+ 1 - 1
src/geometries/CylinderGeometry.js

@@ -273,4 +273,4 @@ class CylinderGeometry extends BufferGeometry {
 }
 }
 
 
 
 
-export { CylinderGeometry, CylinderGeometry as CylinderBufferGeometry };
+export { CylinderGeometry };

+ 1 - 1
src/geometries/DodecahedronGeometry.js

@@ -63,4 +63,4 @@ class DodecahedronGeometry extends PolyhedronGeometry {
 }
 }
 
 
 
 
-export { DodecahedronGeometry, DodecahedronGeometry as DodecahedronBufferGeometry };
+export { DodecahedronGeometry };

+ 1 - 1
src/geometries/ExtrudeGeometry.js

@@ -801,4 +801,4 @@ function toJSON( shapes, options, data ) {
 }
 }
 
 
 
 
-export { ExtrudeGeometry, ExtrudeGeometry as ExtrudeBufferGeometry };
+export { ExtrudeGeometry };

+ 1 - 1
src/geometries/IcosahedronGeometry.js

@@ -39,4 +39,4 @@ class IcosahedronGeometry extends PolyhedronGeometry {
 }
 }
 
 
 
 
-export { IcosahedronGeometry, IcosahedronGeometry as IcosahedronBufferGeometry };
+export { IcosahedronGeometry };

+ 1 - 1
src/geometries/LatheGeometry.js

@@ -176,4 +176,4 @@ class LatheGeometry extends BufferGeometry {
 }
 }
 
 
 
 
-export { LatheGeometry, LatheGeometry as LatheBufferGeometry };
+export { LatheGeometry };

+ 1 - 1
src/geometries/OctahedronGeometry.js

@@ -34,4 +34,4 @@ class OctahedronGeometry extends PolyhedronGeometry {
 
 
 }
 }
 
 
-export { OctahedronGeometry, OctahedronGeometry as OctahedronBufferGeometry };
+export { OctahedronGeometry };

+ 1 - 1
src/geometries/PlaneGeometry.js

@@ -85,4 +85,4 @@ class PlaneGeometry extends BufferGeometry {
 
 
 }
 }
 
 
-export { PlaneGeometry, PlaneGeometry as PlaneBufferGeometry };
+export { PlaneGeometry };

+ 1 - 1
src/geometries/PolyhedronGeometry.js

@@ -306,4 +306,4 @@ class PolyhedronGeometry extends BufferGeometry {
 
 
 }
 }
 
 
-export { PolyhedronGeometry, PolyhedronGeometry as PolyhedronBufferGeometry };
+export { PolyhedronGeometry };

+ 1 - 1
src/geometries/RingGeometry.js

@@ -115,4 +115,4 @@ class RingGeometry extends BufferGeometry {
 }
 }
 
 
 
 
-export { RingGeometry, RingGeometry as RingBufferGeometry };
+export { RingGeometry };

+ 1 - 1
src/geometries/ShapeGeometry.js

@@ -182,4 +182,4 @@ function toJSON( shapes, data ) {
 
 
 }
 }
 
 
-export { ShapeGeometry, ShapeGeometry as ShapeBufferGeometry };
+export { ShapeGeometry };

+ 1 - 1
src/geometries/SphereGeometry.js

@@ -124,4 +124,4 @@ class SphereGeometry extends BufferGeometry {
 
 
 }
 }
 
 
-export { SphereGeometry, SphereGeometry as SphereBufferGeometry };
+export { SphereGeometry };

+ 1 - 1
src/geometries/TetrahedronGeometry.js

@@ -31,4 +31,4 @@ class TetrahedronGeometry extends PolyhedronGeometry {
 
 
 }
 }
 
 
-export { TetrahedronGeometry, TetrahedronGeometry as TetrahedronBufferGeometry };
+export { TetrahedronGeometry };

+ 1 - 1
src/geometries/TorusGeometry.js

@@ -107,4 +107,4 @@ class TorusGeometry extends BufferGeometry {
 
 
 }
 }
 
 
-export { TorusGeometry, TorusGeometry as TorusBufferGeometry };
+export { TorusGeometry };

+ 1 - 1
src/geometries/TorusKnotGeometry.js

@@ -154,4 +154,4 @@ class TorusKnotGeometry extends BufferGeometry {
 
 
 }
 }
 
 
-export { TorusKnotGeometry, TorusKnotGeometry as TorusKnotBufferGeometry };
+export { TorusKnotGeometry };

+ 1 - 1
src/geometries/TubeGeometry.js

@@ -190,4 +190,4 @@ class TubeGeometry extends BufferGeometry {
 }
 }
 
 
 
 
-export { TubeGeometry, TubeGeometry as TubeBufferGeometry };
+export { TubeGeometry };

+ 1 - 2
test/unit/src/geometries/BoxGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { BoxGeometry, BoxBufferGeometry } from '../../../../src/geometries/BoxGeometry.js';
+import { BoxGeometry } from '../../../../src/geometries/BoxGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -23,7 +23,6 @@ export default QUnit.module( 'Geometries', () => {
 				new BoxGeometry(),
 				new BoxGeometry(),
 				new BoxGeometry( parameters.width, parameters.height, parameters.depth ),
 				new BoxGeometry( parameters.width, parameters.height, parameters.depth ),
 				new BoxGeometry( parameters.width, parameters.height, parameters.depth, parameters.widthSegments, parameters.heightSegments, parameters.depthSegments ),
 				new BoxGeometry( parameters.width, parameters.height, parameters.depth, parameters.widthSegments, parameters.heightSegments, parameters.depthSegments ),
-				new BoxBufferGeometry()
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/CapsuleGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { CapsuleGeometry, CapsuleBufferGeometry } from '../../../../src/geometries/CapsuleGeometry.js';
+import { CapsuleGeometry } from '../../../../src/geometries/CapsuleGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -23,7 +23,6 @@ export default QUnit.module( 'Geometries', () => {
 				new CapsuleGeometry( parameters.radius, parameters.length ),
 				new CapsuleGeometry( parameters.radius, parameters.length ),
 				new CapsuleGeometry( parameters.radius, parameters.length, parameters.capSegments ),
 				new CapsuleGeometry( parameters.radius, parameters.length, parameters.capSegments ),
 				new CapsuleGeometry( parameters.radius, parameters.length, parameters.capSegments, parameters.heightSegments ),
 				new CapsuleGeometry( parameters.radius, parameters.length, parameters.capSegments, parameters.heightSegments ),
-				new CapsuleBufferGeometry(),
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/CircleGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { CircleGeometry, CircleBufferGeometry } from '../../../../src/geometries/CircleGeometry.js';
+import { CircleGeometry } from '../../../../src/geometries/CircleGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -23,7 +23,6 @@ export default QUnit.module( 'Geometries', () => {
 				new CircleGeometry( parameters.radius, parameters.segments ),
 				new CircleGeometry( parameters.radius, parameters.segments ),
 				new CircleGeometry( parameters.radius, parameters.segments, parameters.thetaStart ),
 				new CircleGeometry( parameters.radius, parameters.segments, parameters.thetaStart ),
 				new CircleGeometry( parameters.radius, parameters.segments, parameters.thetaStart, parameters.thetaLength ),
 				new CircleGeometry( parameters.radius, parameters.segments, parameters.thetaStart, parameters.thetaLength ),
-				new CircleBufferGeometry(),
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/ConeGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { ConeGeometry, ConeBufferGeometry } from '../../../../src/geometries/ConeGeometry.js';
+import { ConeGeometry } from '../../../../src/geometries/ConeGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -12,7 +12,6 @@ export default QUnit.module( 'Geometries', () => {
 
 
 			geometries = [
 			geometries = [
 				new ConeGeometry(),
 				new ConeGeometry(),
-				new ConeBufferGeometry()
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/CylinderGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { CylinderGeometry, CylinderBufferGeometry } from '../../../../src/geometries/CylinderGeometry.js';
+import { CylinderGeometry } from '../../../../src/geometries/CylinderGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -31,7 +31,6 @@ export default QUnit.module( 'Geometries', () => {
 				new CylinderGeometry( parameters.radiusTop, parameters.radiusBottom, parameters.height, parameters.radialSegments, parameters.heightSegments, parameters.openEnded ),
 				new CylinderGeometry( parameters.radiusTop, parameters.radiusBottom, parameters.height, parameters.radialSegments, parameters.heightSegments, parameters.openEnded ),
 				new CylinderGeometry( parameters.radiusTop, parameters.radiusBottom, parameters.height, parameters.radialSegments, parameters.heightSegments, parameters.openEnded, parameters.thetaStart ),
 				new CylinderGeometry( parameters.radiusTop, parameters.radiusBottom, parameters.height, parameters.radialSegments, parameters.heightSegments, parameters.openEnded, parameters.thetaStart ),
 				new CylinderGeometry( parameters.radiusTop, parameters.radiusBottom, parameters.height, parameters.radialSegments, parameters.heightSegments, parameters.openEnded, parameters.thetaStart, parameters.thetaLength ),
 				new CylinderGeometry( parameters.radiusTop, parameters.radiusBottom, parameters.height, parameters.radialSegments, parameters.heightSegments, parameters.openEnded, parameters.thetaStart, parameters.thetaLength ),
-				new CylinderBufferGeometry()
 			];
 			];
 
 
 		} );
 		} );

+ 2 - 3
test/unit/src/geometries/DodecahedronGeometry.tests.js

@@ -1,11 +1,11 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { DodecahedronGeometry, DodecahedronBufferGeometry } from '../../../../src/geometries/DodecahedronGeometry.js';
+import { DodecahedronGeometry } from '../../../../src/geometries/DodecahedronGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
-	QUnit.module( 'CircleBufferGeometry', ( hooks ) => {
+	QUnit.module( 'DodecahedronGeometry', ( hooks ) => {
 
 
 		var geometries = undefined;
 		var geometries = undefined;
 		hooks.beforeEach( function () {
 		hooks.beforeEach( function () {
@@ -19,7 +19,6 @@ export default QUnit.module( 'Geometries', () => {
 				new DodecahedronGeometry(),
 				new DodecahedronGeometry(),
 				new DodecahedronGeometry( parameters.radius ),
 				new DodecahedronGeometry( parameters.radius ),
 				new DodecahedronGeometry( parameters.radius, parameters.detail ),
 				new DodecahedronGeometry( parameters.radius, parameters.detail ),
-				new DodecahedronBufferGeometry()
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/IcosahedronGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { IcosahedronGeometry, IcosahedronBufferGeometry } from '../../../../src/geometries/IcosahedronGeometry.js';
+import { IcosahedronGeometry } from '../../../../src/geometries/IcosahedronGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -19,7 +19,6 @@ export default QUnit.module( 'Geometries', () => {
 				new IcosahedronGeometry(),
 				new IcosahedronGeometry(),
 				new IcosahedronGeometry( parameters.radius ),
 				new IcosahedronGeometry( parameters.radius ),
 				new IcosahedronGeometry( parameters.radius, parameters.detail ),
 				new IcosahedronGeometry( parameters.radius, parameters.detail ),
-				new IcosahedronBufferGeometry()
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/LatheGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { LatheGeometry, LatheBufferGeometry } from '../../../../src/geometries/LatheGeometry.js';
+import { LatheGeometry } from '../../../../src/geometries/LatheGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -19,7 +19,6 @@ export default QUnit.module( 'Geometries', () => {
 
 
 			geometries = [
 			geometries = [
 				new LatheGeometry( parameters.points ),
 				new LatheGeometry( parameters.points ),
-				new LatheBufferGeometry( parameters.points ),
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/OctahedronGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { OctahedronGeometry, OctahedronBufferGeometry } from '../../../../src/geometries/OctahedronGeometry.js';
+import { OctahedronGeometry } from '../../../../src/geometries/OctahedronGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -19,7 +19,6 @@ export default QUnit.module( 'Geometries', () => {
 				new OctahedronGeometry(),
 				new OctahedronGeometry(),
 				new OctahedronGeometry( parameters.radius ),
 				new OctahedronGeometry( parameters.radius ),
 				new OctahedronGeometry( parameters.radius, parameters.detail ),
 				new OctahedronGeometry( parameters.radius, parameters.detail ),
-				new OctahedronBufferGeometry()
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/PlaneGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { PlaneGeometry, PlaneBufferGeometry } from '../../../../src/geometries/PlaneGeometry.js';
+import { PlaneGeometry } from '../../../../src/geometries/PlaneGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -23,7 +23,6 @@ export default QUnit.module( 'Geometries', () => {
 				new PlaneGeometry( parameters.width, parameters.height ),
 				new PlaneGeometry( parameters.width, parameters.height ),
 				new PlaneGeometry( parameters.width, parameters.height, parameters.widthSegments ),
 				new PlaneGeometry( parameters.width, parameters.height, parameters.widthSegments ),
 				new PlaneGeometry( parameters.width, parameters.height, parameters.widthSegments, parameters.heightSegments ),
 				new PlaneGeometry( parameters.width, parameters.height, parameters.widthSegments, parameters.heightSegments ),
-				new PlaneBufferGeometry()
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/PolyhedronGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { PolyhedronGeometry, PolyhedronBufferGeometry } from '../../../../src/geometries/PolyhedronGeometry.js';
+import { PolyhedronGeometry } from '../../../../src/geometries/PolyhedronGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -20,7 +20,6 @@ export default QUnit.module( 'Geometries', () => {
 
 
 			geometries = [
 			geometries = [
 				new PolyhedronGeometry( vertices, indices ),
 				new PolyhedronGeometry( vertices, indices ),
-				new PolyhedronBufferGeometry( vertices, indices )
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/RingGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { RingGeometry, RingBufferGeometry } from '../../../../src/geometries/RingGeometry.js';
+import { RingGeometry, } from '../../../../src/geometries/RingGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -27,7 +27,6 @@ export default QUnit.module( 'Geometries', () => {
 				new RingGeometry( parameters.innerRadius, parameters.outerRadius, parameters.thetaSegments, parameters.phiSegments ),
 				new RingGeometry( parameters.innerRadius, parameters.outerRadius, parameters.thetaSegments, parameters.phiSegments ),
 				new RingGeometry( parameters.innerRadius, parameters.outerRadius, parameters.thetaSegments, parameters.phiSegments, parameters.thetaStart ),
 				new RingGeometry( parameters.innerRadius, parameters.outerRadius, parameters.thetaSegments, parameters.phiSegments, parameters.thetaStart ),
 				new RingGeometry( parameters.innerRadius, parameters.outerRadius, parameters.thetaSegments, parameters.phiSegments, parameters.thetaStart, parameters.thetaLength ),
 				new RingGeometry( parameters.innerRadius, parameters.outerRadius, parameters.thetaSegments, parameters.phiSegments, parameters.thetaStart, parameters.thetaLength ),
-				new RingBufferGeometry()
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/ShapeGeometry.tests.js

@@ -1,6 +1,6 @@
 /* global QUnit */
 /* global QUnit */
 
 
-import { ShapeGeometry, ShapeBufferGeometry } from '../../../../src/geometries/ShapeGeometry.js';
+import { ShapeGeometry } from '../../../../src/geometries/ShapeGeometry.js';
 
 
 import { Shape } from '../../../../src/extras/core/Shape.js';
 import { Shape } from '../../../../src/extras/core/Shape.js';
 
 
@@ -18,7 +18,6 @@ export default QUnit.module( 'Geometries', () => {
 
 
 			geometries = [
 			geometries = [
 				new ShapeGeometry( triangleShape ),
 				new ShapeGeometry( triangleShape ),
-				new ShapeBufferGeometry( triangleShape )
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/SphereGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { SphereGeometry, SphereBufferGeometry } from '../../../../src/geometries/SphereGeometry.js';
+import { SphereGeometry } from '../../../../src/geometries/SphereGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -29,7 +29,6 @@ export default QUnit.module( 'Geometries', () => {
 				new SphereGeometry( parameters.radius, parameters.widthSegments, parameters.heightSegments, parameters.phiStart, parameters.phiLength ),
 				new SphereGeometry( parameters.radius, parameters.widthSegments, parameters.heightSegments, parameters.phiStart, parameters.phiLength ),
 				new SphereGeometry( parameters.radius, parameters.widthSegments, parameters.heightSegments, parameters.phiStart, parameters.phiLength, parameters.thetaStart ),
 				new SphereGeometry( parameters.radius, parameters.widthSegments, parameters.heightSegments, parameters.phiStart, parameters.phiLength, parameters.thetaStart ),
 				new SphereGeometry( parameters.radius, parameters.widthSegments, parameters.heightSegments, parameters.phiStart, parameters.phiLength, parameters.thetaStart, parameters.thetaLength ),
 				new SphereGeometry( parameters.radius, parameters.widthSegments, parameters.heightSegments, parameters.phiStart, parameters.phiLength, parameters.thetaStart, parameters.thetaLength ),
-				new SphereBufferGeometry()
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/TetrahedronGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { TetrahedronGeometry, TetrahedronBufferGeometry } from '../../../../src/geometries/TetrahedronGeometry.js';
+import { TetrahedronGeometry } from '../../../../src/geometries/TetrahedronGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -19,7 +19,6 @@ export default QUnit.module( 'Geometries', () => {
 				new TetrahedronGeometry(),
 				new TetrahedronGeometry(),
 				new TetrahedronGeometry( parameters.radius ),
 				new TetrahedronGeometry( parameters.radius ),
 				new TetrahedronGeometry( parameters.radius, parameters.detail ),
 				new TetrahedronGeometry( parameters.radius, parameters.detail ),
-				new TetrahedronBufferGeometry()
 			];
 			];
 
 
 		} );
 		} );

+ 2 - 3
test/unit/src/geometries/TorusGeometry.tests.js

@@ -1,11 +1,11 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { TorusGeometry, TorusBufferGeometry } from '../../../../src/geometries/TorusGeometry.js';
+import { TorusGeometry } from '../../../../src/geometries/TorusGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
-	QUnit.module( 'TorusBufferGeometry', ( hooks ) => {
+	QUnit.module( 'TorusGeometry', ( hooks ) => {
 
 
 		var geometries = undefined;
 		var geometries = undefined;
 		hooks.beforeEach( function () {
 		hooks.beforeEach( function () {
@@ -25,7 +25,6 @@ export default QUnit.module( 'Geometries', () => {
 				new TorusGeometry( parameters.radius, parameters.tube, parameters.radialSegments ),
 				new TorusGeometry( parameters.radius, parameters.tube, parameters.radialSegments ),
 				new TorusGeometry( parameters.radius, parameters.tube, parameters.radialSegments, parameters.tubularSegments ),
 				new TorusGeometry( parameters.radius, parameters.tube, parameters.radialSegments, parameters.tubularSegments ),
 				new TorusGeometry( parameters.radius, parameters.tube, parameters.radialSegments, parameters.tubularSegments, parameters.arc ),
 				new TorusGeometry( parameters.radius, parameters.tube, parameters.radialSegments, parameters.tubularSegments, parameters.arc ),
-				new TorusBufferGeometry()
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/TorusKnotGeometry.tests.js

@@ -1,7 +1,7 @@
 /* global QUnit */
 /* global QUnit */
 
 
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
 import { runStdGeometryTests } from '../../utils/qunit-utils.js';
-import { TorusKnotGeometry, TorusKnotBufferGeometry } from '../../../../src/geometries/TorusKnotGeometry.js';
+import { TorusKnotGeometry } from '../../../../src/geometries/TorusKnotGeometry.js';
 
 
 export default QUnit.module( 'Geometries', () => {
 export default QUnit.module( 'Geometries', () => {
 
 
@@ -26,7 +26,6 @@ export default QUnit.module( 'Geometries', () => {
 				new TorusKnotGeometry( parameters.radius, parameters.tube, parameters.tubularSegments ),
 				new TorusKnotGeometry( parameters.radius, parameters.tube, parameters.tubularSegments ),
 				new TorusKnotGeometry( parameters.radius, parameters.tube, parameters.tubularSegments, parameters.radialSegments ),
 				new TorusKnotGeometry( parameters.radius, parameters.tube, parameters.tubularSegments, parameters.radialSegments ),
 				new TorusKnotGeometry( parameters.radius, parameters.tube, parameters.tubularSegments, parameters.radialSegments, parameters.p, parameters.q ),
 				new TorusKnotGeometry( parameters.radius, parameters.tube, parameters.tubularSegments, parameters.radialSegments, parameters.p, parameters.q ),
-				new TorusKnotBufferGeometry()
 			];
 			];
 
 
 		} );
 		} );

+ 1 - 2
test/unit/src/geometries/TubeGeometry.tests.js

@@ -1,6 +1,6 @@
 /* global QUnit */
 /* global QUnit */
 
 
-import { TubeGeometry, TubeBufferGeometry } from '../../../../src/geometries/TubeGeometry.js';
+import { TubeGeometry } from '../../../../src/geometries/TubeGeometry.js';
 
 
 import { LineCurve3 } from '../../../../src/extras/curves/LineCurve3.js';
 import { LineCurve3 } from '../../../../src/extras/curves/LineCurve3.js';
 import { Vector3 } from '../../../../src/math/Vector3.js';
 import { Vector3 } from '../../../../src/math/Vector3.js';
@@ -16,7 +16,6 @@ export default QUnit.module( 'Geometries', () => {
 
 
 			geometries = [
 			geometries = [
 				new TubeGeometry( path ),
 				new TubeGeometry( path ),
-				new TubeBufferGeometry( path )
 			];
 			];
 
 
 		} );
 		} );

+ 3 - 3
test/unit/src/math/Box3.tests.js

@@ -10,7 +10,7 @@ import { Mesh } from '../../../../src/objects/Mesh.js';
 import { BufferAttribute } from '../../../../src/core/BufferAttribute.js';
 import { BufferAttribute } from '../../../../src/core/BufferAttribute.js';
 import { BoxGeometry } from '../../../../src/geometries/BoxGeometry.js';
 import { BoxGeometry } from '../../../../src/geometries/BoxGeometry.js';
 import {
 import {
-	SphereBufferGeometry,
+	SphereGeometry,
 } from '../../../../src/geometries/SphereGeometry.js';
 } from '../../../../src/geometries/SphereGeometry.js';
 import {
 import {
 	negInf3,
 	negInf3,
@@ -171,8 +171,8 @@ export default QUnit.module( 'Maths', () => {
 		QUnit.test( 'setFromObject/Precise', ( assert ) => {
 		QUnit.test( 'setFromObject/Precise', ( assert ) => {
 
 
 			var a = new Box3( zero3.clone(), one3.clone() );
 			var a = new Box3( zero3.clone(), one3.clone() );
-			var object = new Mesh( new SphereBufferGeometry( 1, 32, 32 ) );
-			var child = new Mesh( new SphereBufferGeometry( 2, 32, 32 ) );
+			var object = new Mesh( new SphereGeometry( 1, 32, 32 ) );
+			var child = new Mesh( new SphereGeometry( 2, 32, 32 ) );
 			object.add( child );
 			object.add( child );
 
 
 			object.rotation.setFromVector3( new Vector3( 0, 0, Math.PI / 4.0 ) );
 			object.rotation.setFromVector3( new Vector3( 0, 0, Math.PI / 4.0 ) );