Skip to content

Commit 5acd8ce

Browse files
WestLangleyWestLangley
authored
Deprecate legacy BufferGeometry nomenclature for built-in geometries (mrdoob#24352)
* Deprecate legacy nomenclature * Update revision number
1 parent 5b96d99 commit 5acd8ce

39 files changed

+311
-60
lines changed

Diff for: ‎src/Three.Legacy.js

+269
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
import { WebGLRenderTarget } from './renderers/WebGLRenderTarget.js';
22
import { DataArrayTexture } from './textures/DataArrayTexture.js';
33
import { Data3DTexture } from './textures/Data3DTexture.js';
4+
import { BoxGeometry } from './geometries/BoxGeometry.js';
5+
import { CapsuleGeometry } from './geometries/CapsuleGeometry.js';
6+
import { CircleGeometry } from './geometries/CircleGeometry.js';
7+
import { ConeGeometry } from './geometries/ConeGeometry.js';
8+
import { CylinderGeometry } from './geometries/CylinderGeometry.js';
9+
import { DodecahedronGeometry } from './geometries/DodecahedronGeometry.js';
10+
import { ExtrudeGeometry } from './geometries/ExtrudeGeometry.js';
11+
import { IcosahedronGeometry } from './geometries/IcosahedronGeometry.js';
12+
import { LatheGeometry } from './geometries/LatheGeometry.js';
13+
import { OctahedronGeometry } from './geometries/OctahedronGeometry.js';
14+
import { PlaneGeometry } from './geometries/PlaneGeometry.js';
15+
import { PolyhedronGeometry } from './geometries/PolyhedronGeometry.js';
16+
import { RingGeometry } from './geometries/RingGeometry.js';
17+
import { ShapeGeometry } from './geometries/ShapeGeometry.js';
18+
import { SphereGeometry } from './geometries/SphereGeometry.js';
19+
import { TetrahedronGeometry } from './geometries/TetrahedronGeometry.js';
20+
import { TorusGeometry } from './geometries/TorusGeometry.js';
21+
import { TorusKnotGeometry } from './geometries/TorusKnotGeometry.js';
22+
import { TubeGeometry } from './geometries/TubeGeometry.js';
423

524
// r134, d65e0af06644fe5a84a6fc0e372f4318f95a04c0
625

@@ -49,3 +68,253 @@ export class DataTexture3D extends Data3DTexture {
4968
}
5069

5170
}
71+
72+
// r144
73+
74+
export class BoxBufferGeometry extends BoxGeometry {
75+
76+
constructor( width, height, depth, widthSegments, heightSegments, depthSegments ) {
77+
78+
console.warn( 'THREE.BoxBufferGeometry has been renamed to THREE.BoxGeometry.' );
79+
super( width, height, depth, widthSegments, heightSegments, depthSegments );
80+
81+
82+
}
83+
84+
}
85+
86+
// r144
87+
88+
export class CapsuleBufferGeometry extends CapsuleGeometry {
89+
90+
constructor( radius, length, capSegments, radialSegments ) {
91+
92+
console.warn( 'THREE.CapsuleBufferGeometry has been renamed to THREE.CapsuleGeometry.' );
93+
super( radius, length, capSegments, radialSegments );
94+
95+
}
96+
97+
}
98+
99+
// r144
100+
101+
export class CircleBufferGeometry extends CircleGeometry {
102+
103+
constructor( radius, segments, thetaStart, thetaLength ) {
104+
105+
console.warn( 'THREE.CircleBufferGeometry has been renamed to THREE.CircleGeometry.' );
106+
super( radius, segments, thetaStart, thetaLength );
107+
108+
}
109+
110+
}
111+
112+
// r144
113+
114+
export class ConeBufferGeometry extends ConeGeometry {
115+
116+
constructor( radius, height, radialSegments, heightSegments, openEnded, thetaStart, thetaLength ) {
117+
118+
console.warn( 'THREE.ConeBufferGeometry has been renamed to THREE.ConeGeometry.' );
119+
super( radius, height, radialSegments, heightSegments, openEnded, thetaStart, thetaLength );
120+
121+
}
122+
123+
}
124+
125+
// r144
126+
127+
export class CylinderBufferGeometry extends CylinderGeometry {
128+
129+
constructor( radiusTop, radiusBottom, height, radialSegments, heightSegments, openEnded, thetaStart, thetaLength ) {
130+
131+
console.warn( 'THREE.CylinderBufferGeometry has been renamed to THREE.CylinderGeometry.' );
132+
super( radiusTop, radiusBottom, height, radialSegments, heightSegments, openEnded, thetaStart, thetaLength );
133+
134+
}
135+
136+
}
137+
138+
// r144
139+
140+
export class DodecahedronBufferGeometry extends DodecahedronGeometry {
141+
142+
constructor( radius, detail ) {
143+
144+
console.warn( 'THREE.DodecahedronBufferGeometry has been renamed to THREE.DodecahedronGeometry.' );
145+
super( radius, detail );
146+
147+
}
148+
149+
}
150+
151+
// r144
152+
153+
export class ExtrudeBufferGeometry extends ExtrudeGeometry {
154+
155+
constructor( shapes, options ) {
156+
157+
console.warn( 'THREE.ExtrudeBufferGeometry has been renamed to THREE.ExtrudeGeometry.' );
158+
super( shapes, options );
159+
160+
}
161+
162+
}
163+
164+
// r144
165+
166+
export class IcosahedronBufferGeometry extends IcosahedronGeometry {
167+
168+
constructor( radius, detail ) {
169+
170+
console.warn( 'THREE.IcosahedronBufferGeometry has been renamed to THREE.IcosahedronGeometry.' );
171+
super( radius, detail );
172+
173+
}
174+
175+
}
176+
177+
// r144
178+
179+
export class LatheBufferGeometry extends LatheGeometry {
180+
181+
constructor( points, segments, phiStart, phiLength ) {
182+
183+
console.warn( 'THREE.LatheBufferGeometry has been renamed to THREE.LatheGeometry.' );
184+
super( points, segments, phiStart, phiLength );
185+
186+
}
187+
188+
}
189+
190+
// r144
191+
192+
export class OctahedronBufferGeometry extends OctahedronGeometry {
193+
194+
constructor( radius, detail ) {
195+
196+
console.warn( 'THREE.OctahedronBufferGeometry has been renamed to THREE.OctahedronGeometry.' );
197+
super( radius, detail );
198+
199+
}
200+
201+
}
202+
203+
// r144
204+
205+
export class PlaneBufferGeometry extends PlaneGeometry {
206+
207+
constructor( width, height, widthSegments, heightSegments ) {
208+
209+
console.warn( 'THREE.PlaneBufferGeometry has been renamed to THREE.PlaneGeometry.' );
210+
super( width, height, widthSegments, heightSegments );
211+
212+
}
213+
214+
}
215+
216+
// r144
217+
218+
export class PolyhedronBufferGeometry extends PolyhedronGeometry {
219+
220+
constructor( vertices, indices, radius, detail ) {
221+
222+
console.warn( 'THREE.PolyhedronBufferGeometry has been renamed to THREE.PolyhedronGeometry.' );
223+
super( vertices, indices, radius, detail );
224+
225+
}
226+
227+
}
228+
229+
// r144
230+
231+
export class RingBufferGeometry extends RingGeometry {
232+
233+
constructor( innerRadius, outerRadius, thetaSegments, phiSegments, thetaStart, thetaLength ) {
234+
235+
console.warn( 'THREE.RingBufferGeometry has been renamed to THREE.RingGeometry.' );
236+
super( innerRadius, outerRadius, thetaSegments, phiSegments, thetaStart, thetaLength );
237+
238+
}
239+
240+
}
241+
242+
// r144
243+
244+
export class ShapeBufferGeometry extends ShapeGeometry {
245+
246+
constructor( shapes, curveSegments ) {
247+
248+
console.warn( 'THREE.ShapeBufferGeometry has been renamed to THREE.ShapeGeometry.' );
249+
super( shapes, curveSegments );
250+
251+
}
252+
253+
}
254+
255+
// r144
256+
257+
export class SphereBufferGeometry extends SphereGeometry {
258+
259+
constructor( radius, widthSegments, heightSegments, phiStart, phiLength, thetaStart, thetaLength ) {
260+
261+
console.warn( 'THREE.SphereBufferGeometry has been renamed to THREE.SphereGeometry.' );
262+
super( radius, widthSegments, heightSegments, phiStart, phiLength, thetaStart, thetaLength );
263+
264+
}
265+
266+
}
267+
268+
// r144
269+
270+
export class TetrahedronBufferGeometry extends TetrahedronGeometry {
271+
272+
constructor( radius, detail ) {
273+
274+
console.warn( 'THREE.TetrahedronBufferGeometry has been renamed to THREE.TetrahedronGeometry.' );
275+
super( radius, detail );
276+
277+
}
278+
279+
}
280+
281+
// r144
282+
283+
export class TorusBufferGeometry extends TorusGeometry {
284+
285+
constructor( radius, tube, radialSegments, tubularSegments, arc ) {
286+
287+
console.warn( 'THREE.TorusBufferGeometry has been renamed to THREE.TorusGeometry.' );
288+
super( radius, tube, radialSegments, tubularSegments, arc );
289+
290+
}
291+
292+
}
293+
294+
// r144
295+
296+
export class TorusKnotBufferGeometry extends TorusKnotGeometry {
297+
298+
constructor( radius, tube, tubularSegments, radialSegments, p, q ) {
299+
300+
console.warn( 'THREE.TorusKnotBufferGeometry has been renamed to THREE.TorusKnotGeometry.' );
301+
super( radius, tube, tubularSegments, radialSegments, p, q );
302+
303+
}
304+
305+
}
306+
307+
// r144
308+
309+
export class TubeBufferGeometry extends TubeGeometry {
310+
311+
constructor( path, tubularSegments, radius, radialSegments, closed ) {
312+
313+
console.warn( 'THREE.TubeBufferGeometry has been renamed to THREE.TubeGeometry.' );
314+
super( path, tubularSegments, radius, radialSegments, closed );
315+
316+
}
317+
318+
}
319+
320+

Diff for: ‎src/geometries/BoxGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,4 +167,4 @@ class BoxGeometry extends BufferGeometry {
167167

168168
}
169169

170-
export { BoxGeometry, BoxGeometry as BoxBufferGeometry };
170+
export { BoxGeometry };

Diff for: ‎src/geometries/CapsuleGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ class CapsuleGeometry extends LatheGeometry {
3030

3131
}
3232

33-
export { CapsuleGeometry, CapsuleGeometry as CapsuleBufferGeometry };
33+
export { CapsuleGeometry };

Diff for: ‎src/geometries/CircleGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,4 @@ class CircleGeometry extends BufferGeometry {
8888
}
8989

9090

91-
export { CircleGeometry, CircleGeometry as CircleBufferGeometry };
91+
export { CircleGeometry };

Diff for: ‎src/geometries/ConeGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ class ConeGeometry extends CylinderGeometry {
2828

2929
}
3030

31-
export { ConeGeometry, ConeGeometry as ConeBufferGeometry };
31+
export { ConeGeometry };

Diff for: ‎src/geometries/CylinderGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,4 +273,4 @@ class CylinderGeometry extends BufferGeometry {
273273
}
274274

275275

276-
export { CylinderGeometry, CylinderGeometry as CylinderBufferGeometry };
276+
export { CylinderGeometry };

Diff for: ‎src/geometries/DodecahedronGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ class DodecahedronGeometry extends PolyhedronGeometry {
6363
}
6464

6565

66-
export { DodecahedronGeometry, DodecahedronGeometry as DodecahedronBufferGeometry };
66+
export { DodecahedronGeometry };

Diff for: ‎src/geometries/ExtrudeGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -801,4 +801,4 @@ function toJSON( shapes, options, data ) {
801801
}
802802

803803

804-
export { ExtrudeGeometry, ExtrudeGeometry as ExtrudeBufferGeometry };
804+
export { ExtrudeGeometry };

Diff for: ‎src/geometries/IcosahedronGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ class IcosahedronGeometry extends PolyhedronGeometry {
3939
}
4040

4141

42-
export { IcosahedronGeometry, IcosahedronGeometry as IcosahedronBufferGeometry };
42+
export { IcosahedronGeometry };

Diff for: ‎src/geometries/LatheGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,4 +176,4 @@ class LatheGeometry extends BufferGeometry {
176176
}
177177

178178

179-
export { LatheGeometry, LatheGeometry as LatheBufferGeometry };
179+
export { LatheGeometry };

Diff for: ‎src/geometries/OctahedronGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ class OctahedronGeometry extends PolyhedronGeometry {
3434

3535
}
3636

37-
export { OctahedronGeometry, OctahedronGeometry as OctahedronBufferGeometry };
37+
export { OctahedronGeometry };

Diff for: ‎src/geometries/PlaneGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,4 @@ class PlaneGeometry extends BufferGeometry {
8585

8686
}
8787

88-
export { PlaneGeometry, PlaneGeometry as PlaneBufferGeometry };
88+
export { PlaneGeometry };

Diff for: ‎src/geometries/PolyhedronGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,4 +306,4 @@ class PolyhedronGeometry extends BufferGeometry {
306306

307307
}
308308

309-
export { PolyhedronGeometry, PolyhedronGeometry as PolyhedronBufferGeometry };
309+
export { PolyhedronGeometry };

Diff for: ‎src/geometries/RingGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,4 @@ class RingGeometry extends BufferGeometry {
115115
}
116116

117117

118-
export { RingGeometry, RingGeometry as RingBufferGeometry };
118+
export { RingGeometry };

Diff for: ‎src/geometries/ShapeGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,4 @@ function toJSON( shapes, data ) {
182182

183183
}
184184

185-
export { ShapeGeometry, ShapeGeometry as ShapeBufferGeometry };
185+
export { ShapeGeometry };

Diff for: ‎src/geometries/SphereGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,4 +124,4 @@ class SphereGeometry extends BufferGeometry {
124124

125125
}
126126

127-
export { SphereGeometry, SphereGeometry as SphereBufferGeometry };
127+
export { SphereGeometry };

Diff for: ‎src/geometries/TetrahedronGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ class TetrahedronGeometry extends PolyhedronGeometry {
3131

3232
}
3333

34-
export { TetrahedronGeometry, TetrahedronGeometry as TetrahedronBufferGeometry };
34+
export { TetrahedronGeometry };

Diff for: ‎src/geometries/TorusGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,4 @@ class TorusGeometry extends BufferGeometry {
107107

108108
}
109109

110-
export { TorusGeometry, TorusGeometry as TorusBufferGeometry };
110+
export { TorusGeometry };

Diff for: ‎src/geometries/TorusKnotGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,4 @@ class TorusKnotGeometry extends BufferGeometry {
154154

155155
}
156156

157-
export { TorusKnotGeometry, TorusKnotGeometry as TorusKnotBufferGeometry };
157+
export { TorusKnotGeometry };

Diff for: ‎src/geometries/TubeGeometry.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,4 +190,4 @@ class TubeGeometry extends BufferGeometry {
190190
}
191191

192192

193-
export { TubeGeometry, TubeGeometry as TubeBufferGeometry };
193+
export { TubeGeometry };

0 commit comments

Comments
 (0)