diff --git a/src/Three.Legacy.js b/src/Three.Legacy.js index 43abc4fdab2c18..336f55bd848ad9 100644 --- a/src/Three.Legacy.js +++ b/src/Three.Legacy.js @@ -1,6 +1,25 @@ import { WebGLRenderTarget } from './renderers/WebGLRenderTarget.js'; import { DataArrayTexture } from './textures/DataArrayTexture.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 @@ -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 ); + + } + +} + + diff --git a/src/geometries/BoxGeometry.js b/src/geometries/BoxGeometry.js index 00abffcc137f7d..5f3aa4c8590451 100644 --- a/src/geometries/BoxGeometry.js +++ b/src/geometries/BoxGeometry.js @@ -167,4 +167,4 @@ class BoxGeometry extends BufferGeometry { } -export { BoxGeometry, BoxGeometry as BoxBufferGeometry }; +export { BoxGeometry }; diff --git a/src/geometries/CapsuleGeometry.js b/src/geometries/CapsuleGeometry.js index aa5007e97db756..5841e221081459 100644 --- a/src/geometries/CapsuleGeometry.js +++ b/src/geometries/CapsuleGeometry.js @@ -30,4 +30,4 @@ class CapsuleGeometry extends LatheGeometry { } -export { CapsuleGeometry, CapsuleGeometry as CapsuleBufferGeometry }; +export { CapsuleGeometry }; diff --git a/src/geometries/CircleGeometry.js b/src/geometries/CircleGeometry.js index 799bf6628db94f..783d54a1bdb054 100644 --- a/src/geometries/CircleGeometry.js +++ b/src/geometries/CircleGeometry.js @@ -88,4 +88,4 @@ class CircleGeometry extends BufferGeometry { } -export { CircleGeometry, CircleGeometry as CircleBufferGeometry }; +export { CircleGeometry }; diff --git a/src/geometries/ConeGeometry.js b/src/geometries/ConeGeometry.js index 70ceb6a96b1228..c0e3c9f2274cbb 100644 --- a/src/geometries/ConeGeometry.js +++ b/src/geometries/ConeGeometry.js @@ -28,4 +28,4 @@ class ConeGeometry extends CylinderGeometry { } -export { ConeGeometry, ConeGeometry as ConeBufferGeometry }; +export { ConeGeometry }; diff --git a/src/geometries/CylinderGeometry.js b/src/geometries/CylinderGeometry.js index c865131bbb10a3..5ecd2da5bd3f98 100644 --- a/src/geometries/CylinderGeometry.js +++ b/src/geometries/CylinderGeometry.js @@ -273,4 +273,4 @@ class CylinderGeometry extends BufferGeometry { } -export { CylinderGeometry, CylinderGeometry as CylinderBufferGeometry }; +export { CylinderGeometry }; diff --git a/src/geometries/DodecahedronGeometry.js b/src/geometries/DodecahedronGeometry.js index 5627c29579305c..3434df937d9494 100644 --- a/src/geometries/DodecahedronGeometry.js +++ b/src/geometries/DodecahedronGeometry.js @@ -63,4 +63,4 @@ class DodecahedronGeometry extends PolyhedronGeometry { } -export { DodecahedronGeometry, DodecahedronGeometry as DodecahedronBufferGeometry }; +export { DodecahedronGeometry }; diff --git a/src/geometries/ExtrudeGeometry.js b/src/geometries/ExtrudeGeometry.js index 96f12368dc579b..a726b11360d4df 100644 --- a/src/geometries/ExtrudeGeometry.js +++ b/src/geometries/ExtrudeGeometry.js @@ -801,4 +801,4 @@ function toJSON( shapes, options, data ) { } -export { ExtrudeGeometry, ExtrudeGeometry as ExtrudeBufferGeometry }; +export { ExtrudeGeometry }; diff --git a/src/geometries/IcosahedronGeometry.js b/src/geometries/IcosahedronGeometry.js index b489eb0af2d24d..5ffd4a02ba16d4 100644 --- a/src/geometries/IcosahedronGeometry.js +++ b/src/geometries/IcosahedronGeometry.js @@ -39,4 +39,4 @@ class IcosahedronGeometry extends PolyhedronGeometry { } -export { IcosahedronGeometry, IcosahedronGeometry as IcosahedronBufferGeometry }; +export { IcosahedronGeometry }; diff --git a/src/geometries/LatheGeometry.js b/src/geometries/LatheGeometry.js index 8e28b8605c8b06..8e509912221990 100644 --- a/src/geometries/LatheGeometry.js +++ b/src/geometries/LatheGeometry.js @@ -176,4 +176,4 @@ class LatheGeometry extends BufferGeometry { } -export { LatheGeometry, LatheGeometry as LatheBufferGeometry }; +export { LatheGeometry }; diff --git a/src/geometries/OctahedronGeometry.js b/src/geometries/OctahedronGeometry.js index de9b75c31f2e05..d91bb1a18830d7 100644 --- a/src/geometries/OctahedronGeometry.js +++ b/src/geometries/OctahedronGeometry.js @@ -34,4 +34,4 @@ class OctahedronGeometry extends PolyhedronGeometry { } -export { OctahedronGeometry, OctahedronGeometry as OctahedronBufferGeometry }; +export { OctahedronGeometry }; diff --git a/src/geometries/PlaneGeometry.js b/src/geometries/PlaneGeometry.js index bad96d0a3cbe56..d093f041d71a0a 100644 --- a/src/geometries/PlaneGeometry.js +++ b/src/geometries/PlaneGeometry.js @@ -85,4 +85,4 @@ class PlaneGeometry extends BufferGeometry { } -export { PlaneGeometry, PlaneGeometry as PlaneBufferGeometry }; +export { PlaneGeometry }; diff --git a/src/geometries/PolyhedronGeometry.js b/src/geometries/PolyhedronGeometry.js index 36d650ea467bab..8be5d368b372c9 100644 --- a/src/geometries/PolyhedronGeometry.js +++ b/src/geometries/PolyhedronGeometry.js @@ -306,4 +306,4 @@ class PolyhedronGeometry extends BufferGeometry { } -export { PolyhedronGeometry, PolyhedronGeometry as PolyhedronBufferGeometry }; +export { PolyhedronGeometry }; diff --git a/src/geometries/RingGeometry.js b/src/geometries/RingGeometry.js index d1199c19049197..f813da1955d082 100644 --- a/src/geometries/RingGeometry.js +++ b/src/geometries/RingGeometry.js @@ -115,4 +115,4 @@ class RingGeometry extends BufferGeometry { } -export { RingGeometry, RingGeometry as RingBufferGeometry }; +export { RingGeometry }; diff --git a/src/geometries/ShapeGeometry.js b/src/geometries/ShapeGeometry.js index d204b0c55f64c2..065e127e78f3ce 100644 --- a/src/geometries/ShapeGeometry.js +++ b/src/geometries/ShapeGeometry.js @@ -182,4 +182,4 @@ function toJSON( shapes, data ) { } -export { ShapeGeometry, ShapeGeometry as ShapeBufferGeometry }; +export { ShapeGeometry }; diff --git a/src/geometries/SphereGeometry.js b/src/geometries/SphereGeometry.js index 0d5a33dff4df66..8551e9b228c865 100644 --- a/src/geometries/SphereGeometry.js +++ b/src/geometries/SphereGeometry.js @@ -124,4 +124,4 @@ class SphereGeometry extends BufferGeometry { } -export { SphereGeometry, SphereGeometry as SphereBufferGeometry }; +export { SphereGeometry }; diff --git a/src/geometries/TetrahedronGeometry.js b/src/geometries/TetrahedronGeometry.js index 537f664292df48..77c62107f2e8f4 100644 --- a/src/geometries/TetrahedronGeometry.js +++ b/src/geometries/TetrahedronGeometry.js @@ -31,4 +31,4 @@ class TetrahedronGeometry extends PolyhedronGeometry { } -export { TetrahedronGeometry, TetrahedronGeometry as TetrahedronBufferGeometry }; +export { TetrahedronGeometry }; diff --git a/src/geometries/TorusGeometry.js b/src/geometries/TorusGeometry.js index 63696384b368de..354ba92543c5f1 100644 --- a/src/geometries/TorusGeometry.js +++ b/src/geometries/TorusGeometry.js @@ -107,4 +107,4 @@ class TorusGeometry extends BufferGeometry { } -export { TorusGeometry, TorusGeometry as TorusBufferGeometry }; +export { TorusGeometry }; diff --git a/src/geometries/TorusKnotGeometry.js b/src/geometries/TorusKnotGeometry.js index 8a3324ee0c4ed5..66fcdf022b188a 100644 --- a/src/geometries/TorusKnotGeometry.js +++ b/src/geometries/TorusKnotGeometry.js @@ -154,4 +154,4 @@ class TorusKnotGeometry extends BufferGeometry { } -export { TorusKnotGeometry, TorusKnotGeometry as TorusKnotBufferGeometry }; +export { TorusKnotGeometry }; diff --git a/src/geometries/TubeGeometry.js b/src/geometries/TubeGeometry.js index 273a069fb0d914..e02eb923da75c2 100644 --- a/src/geometries/TubeGeometry.js +++ b/src/geometries/TubeGeometry.js @@ -190,4 +190,4 @@ class TubeGeometry extends BufferGeometry { } -export { TubeGeometry, TubeGeometry as TubeBufferGeometry }; +export { TubeGeometry }; diff --git a/test/unit/src/geometries/BoxGeometry.tests.js b/test/unit/src/geometries/BoxGeometry.tests.js index 1a4b5e348ed0cb..9e390dff4552f9 100644 --- a/test/unit/src/geometries/BoxGeometry.tests.js +++ b/test/unit/src/geometries/BoxGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -23,7 +23,6 @@ export default QUnit.module( 'Geometries', () => { new BoxGeometry(), new BoxGeometry( parameters.width, parameters.height, parameters.depth ), new BoxGeometry( parameters.width, parameters.height, parameters.depth, parameters.widthSegments, parameters.heightSegments, parameters.depthSegments ), - new BoxBufferGeometry() ]; } ); diff --git a/test/unit/src/geometries/CapsuleGeometry.tests.js b/test/unit/src/geometries/CapsuleGeometry.tests.js index 126aced28abfcf..802cb74a1c549a 100644 --- a/test/unit/src/geometries/CapsuleGeometry.tests.js +++ b/test/unit/src/geometries/CapsuleGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -23,7 +23,6 @@ export default QUnit.module( 'Geometries', () => { new CapsuleGeometry( parameters.radius, parameters.length ), new CapsuleGeometry( parameters.radius, parameters.length, parameters.capSegments ), new CapsuleGeometry( parameters.radius, parameters.length, parameters.capSegments, parameters.heightSegments ), - new CapsuleBufferGeometry(), ]; } ); diff --git a/test/unit/src/geometries/CircleGeometry.tests.js b/test/unit/src/geometries/CircleGeometry.tests.js index 5c8e8a053349f6..f5572e4f75aa4f 100644 --- a/test/unit/src/geometries/CircleGeometry.tests.js +++ b/test/unit/src/geometries/CircleGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -23,7 +23,6 @@ export default QUnit.module( 'Geometries', () => { new CircleGeometry( parameters.radius, parameters.segments ), new CircleGeometry( parameters.radius, parameters.segments, parameters.thetaStart ), new CircleGeometry( parameters.radius, parameters.segments, parameters.thetaStart, parameters.thetaLength ), - new CircleBufferGeometry(), ]; } ); diff --git a/test/unit/src/geometries/ConeGeometry.tests.js b/test/unit/src/geometries/ConeGeometry.tests.js index 17b741c56c04bf..53baad71db5c59 100644 --- a/test/unit/src/geometries/ConeGeometry.tests.js +++ b/test/unit/src/geometries/ConeGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -12,7 +12,6 @@ export default QUnit.module( 'Geometries', () => { geometries = [ new ConeGeometry(), - new ConeBufferGeometry() ]; } ); diff --git a/test/unit/src/geometries/CylinderGeometry.tests.js b/test/unit/src/geometries/CylinderGeometry.tests.js index 8ff4405ed834ca..749aeaf837be07 100644 --- a/test/unit/src/geometries/CylinderGeometry.tests.js +++ b/test/unit/src/geometries/CylinderGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -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, parameters.thetaStart ), new CylinderGeometry( parameters.radiusTop, parameters.radiusBottom, parameters.height, parameters.radialSegments, parameters.heightSegments, parameters.openEnded, parameters.thetaStart, parameters.thetaLength ), - new CylinderBufferGeometry() ]; } ); diff --git a/test/unit/src/geometries/DodecahedronGeometry.tests.js b/test/unit/src/geometries/DodecahedronGeometry.tests.js index dabda1cb340628..50e53e26759e62 100644 --- a/test/unit/src/geometries/DodecahedronGeometry.tests.js +++ b/test/unit/src/geometries/DodecahedronGeometry.tests.js @@ -1,11 +1,11 @@ /* global QUnit */ 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', () => { - QUnit.module( 'CircleBufferGeometry', ( hooks ) => { + QUnit.module( 'DodecahedronGeometry', ( hooks ) => { var geometries = undefined; hooks.beforeEach( function () { @@ -19,7 +19,6 @@ export default QUnit.module( 'Geometries', () => { new DodecahedronGeometry(), new DodecahedronGeometry( parameters.radius ), new DodecahedronGeometry( parameters.radius, parameters.detail ), - new DodecahedronBufferGeometry() ]; } ); diff --git a/test/unit/src/geometries/IcosahedronGeometry.tests.js b/test/unit/src/geometries/IcosahedronGeometry.tests.js index 74909b63b63846..d1e57f64c1ebd5 100644 --- a/test/unit/src/geometries/IcosahedronGeometry.tests.js +++ b/test/unit/src/geometries/IcosahedronGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -19,7 +19,6 @@ export default QUnit.module( 'Geometries', () => { new IcosahedronGeometry(), new IcosahedronGeometry( parameters.radius ), new IcosahedronGeometry( parameters.radius, parameters.detail ), - new IcosahedronBufferGeometry() ]; } ); diff --git a/test/unit/src/geometries/LatheGeometry.tests.js b/test/unit/src/geometries/LatheGeometry.tests.js index 4a071bb03686f0..0f36fa1f73042d 100644 --- a/test/unit/src/geometries/LatheGeometry.tests.js +++ b/test/unit/src/geometries/LatheGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -19,7 +19,6 @@ export default QUnit.module( 'Geometries', () => { geometries = [ new LatheGeometry( parameters.points ), - new LatheBufferGeometry( parameters.points ), ]; } ); diff --git a/test/unit/src/geometries/OctahedronGeometry.tests.js b/test/unit/src/geometries/OctahedronGeometry.tests.js index 6d14331e2ddad1..9965b764963e99 100644 --- a/test/unit/src/geometries/OctahedronGeometry.tests.js +++ b/test/unit/src/geometries/OctahedronGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -19,7 +19,6 @@ export default QUnit.module( 'Geometries', () => { new OctahedronGeometry(), new OctahedronGeometry( parameters.radius ), new OctahedronGeometry( parameters.radius, parameters.detail ), - new OctahedronBufferGeometry() ]; } ); diff --git a/test/unit/src/geometries/PlaneGeometry.tests.js b/test/unit/src/geometries/PlaneGeometry.tests.js index 4ab40a2531f414..24c2c5611edfcc 100644 --- a/test/unit/src/geometries/PlaneGeometry.tests.js +++ b/test/unit/src/geometries/PlaneGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -23,7 +23,6 @@ export default QUnit.module( 'Geometries', () => { new PlaneGeometry( parameters.width, parameters.height ), new PlaneGeometry( parameters.width, parameters.height, parameters.widthSegments ), new PlaneGeometry( parameters.width, parameters.height, parameters.widthSegments, parameters.heightSegments ), - new PlaneBufferGeometry() ]; } ); diff --git a/test/unit/src/geometries/PolyhedronGeometry.tests.js b/test/unit/src/geometries/PolyhedronGeometry.tests.js index 5609ff5d09d083..8cceb4e0b779c5 100644 --- a/test/unit/src/geometries/PolyhedronGeometry.tests.js +++ b/test/unit/src/geometries/PolyhedronGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -20,7 +20,6 @@ export default QUnit.module( 'Geometries', () => { geometries = [ new PolyhedronGeometry( vertices, indices ), - new PolyhedronBufferGeometry( vertices, indices ) ]; } ); diff --git a/test/unit/src/geometries/RingGeometry.tests.js b/test/unit/src/geometries/RingGeometry.tests.js index c02cf86ce5eec9..962cdb83720940 100644 --- a/test/unit/src/geometries/RingGeometry.tests.js +++ b/test/unit/src/geometries/RingGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -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, parameters.thetaStart ), new RingGeometry( parameters.innerRadius, parameters.outerRadius, parameters.thetaSegments, parameters.phiSegments, parameters.thetaStart, parameters.thetaLength ), - new RingBufferGeometry() ]; } ); diff --git a/test/unit/src/geometries/ShapeGeometry.tests.js b/test/unit/src/geometries/ShapeGeometry.tests.js index f017a1c7e87982..147875f2ba76e3 100644 --- a/test/unit/src/geometries/ShapeGeometry.tests.js +++ b/test/unit/src/geometries/ShapeGeometry.tests.js @@ -1,6 +1,6 @@ /* 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'; @@ -18,7 +18,6 @@ export default QUnit.module( 'Geometries', () => { geometries = [ new ShapeGeometry( triangleShape ), - new ShapeBufferGeometry( triangleShape ) ]; } ); diff --git a/test/unit/src/geometries/SphereGeometry.tests.js b/test/unit/src/geometries/SphereGeometry.tests.js index acd7baac48daf8..5df8c78b894959 100644 --- a/test/unit/src/geometries/SphereGeometry.tests.js +++ b/test/unit/src/geometries/SphereGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -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, parameters.thetaStart ), new SphereGeometry( parameters.radius, parameters.widthSegments, parameters.heightSegments, parameters.phiStart, parameters.phiLength, parameters.thetaStart, parameters.thetaLength ), - new SphereBufferGeometry() ]; } ); diff --git a/test/unit/src/geometries/TetrahedronGeometry.tests.js b/test/unit/src/geometries/TetrahedronGeometry.tests.js index 14b64d0fa45709..2c0440a7288b70 100644 --- a/test/unit/src/geometries/TetrahedronGeometry.tests.js +++ b/test/unit/src/geometries/TetrahedronGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -19,7 +19,6 @@ export default QUnit.module( 'Geometries', () => { new TetrahedronGeometry(), new TetrahedronGeometry( parameters.radius ), new TetrahedronGeometry( parameters.radius, parameters.detail ), - new TetrahedronBufferGeometry() ]; } ); diff --git a/test/unit/src/geometries/TorusGeometry.tests.js b/test/unit/src/geometries/TorusGeometry.tests.js index bf40202edd1bca..cbe202f133426d 100644 --- a/test/unit/src/geometries/TorusGeometry.tests.js +++ b/test/unit/src/geometries/TorusGeometry.tests.js @@ -1,11 +1,11 @@ /* global QUnit */ 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', () => { - QUnit.module( 'TorusBufferGeometry', ( hooks ) => { + QUnit.module( 'TorusGeometry', ( hooks ) => { var geometries = undefined; 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, parameters.tubularSegments ), new TorusGeometry( parameters.radius, parameters.tube, parameters.radialSegments, parameters.tubularSegments, parameters.arc ), - new TorusBufferGeometry() ]; } ); diff --git a/test/unit/src/geometries/TorusKnotGeometry.tests.js b/test/unit/src/geometries/TorusKnotGeometry.tests.js index 7107b176c32909..be0e5d681d4614 100644 --- a/test/unit/src/geometries/TorusKnotGeometry.tests.js +++ b/test/unit/src/geometries/TorusKnotGeometry.tests.js @@ -1,7 +1,7 @@ /* global QUnit */ 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', () => { @@ -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, parameters.radialSegments ), new TorusKnotGeometry( parameters.radius, parameters.tube, parameters.tubularSegments, parameters.radialSegments, parameters.p, parameters.q ), - new TorusKnotBufferGeometry() ]; } ); diff --git a/test/unit/src/geometries/TubeGeometry.tests.js b/test/unit/src/geometries/TubeGeometry.tests.js index 4cc7828388bda8..aa3e9b369bba6a 100644 --- a/test/unit/src/geometries/TubeGeometry.tests.js +++ b/test/unit/src/geometries/TubeGeometry.tests.js @@ -1,6 +1,6 @@ /* 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 { Vector3 } from '../../../../src/math/Vector3.js'; @@ -16,7 +16,6 @@ export default QUnit.module( 'Geometries', () => { geometries = [ new TubeGeometry( path ), - new TubeBufferGeometry( path ) ]; } ); diff --git a/test/unit/src/math/Box3.tests.js b/test/unit/src/math/Box3.tests.js index d758104785f6b9..f383d4d7e7965a 100644 --- a/test/unit/src/math/Box3.tests.js +++ b/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 { BoxGeometry } from '../../../../src/geometries/BoxGeometry.js'; import { - SphereBufferGeometry, + SphereGeometry, } from '../../../../src/geometries/SphereGeometry.js'; import { negInf3, @@ -171,8 +171,8 @@ export default QUnit.module( 'Maths', () => { QUnit.test( 'setFromObject/Precise', ( assert ) => { 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.rotation.setFromVector3( new Vector3( 0, 0, Math.PI / 4.0 ) );