Skip to content

Commit 4aa7ac8

Browse files
mrdoobmrdoob
authored
Merge pull request #13949 from Mugen87/dev4
 ExtrudeGeometry: Renamed option "amount" to "depth".
2 parents aeb1901 + 050f80f commit 4aa7ac8

File tree

10 files changed

+31
-51
lines changed

10 files changed

+31
-51
lines changed

‎docs/api/geometries/ExtrudeBufferGeometry.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h2>Example</h2>
4747

4848
var extrudeSettings = {
4949
steps: 2,
50-
amount: 16,
50+
depth: 16,
5151
bevelEnabled: true,
5252
bevelThickness: 1,
5353
bevelSize: 1,
@@ -72,7 +72,7 @@ <h3>[name]([param:Array shapes], [param:Object options])</h3>
7272
<ul>
7373
<li>curveSegments — int. Number of points on the curves. Default is 12.</li>
7474
<li>steps — int. Number of points used for subdividing segments along the depth of the extruded spline. Default is 1.</li>
75-
<li>amount — float. Depth to extrude the shape. Default is 100.</li>
75+
<li>depth — float. Depth to extrude the shape. Default is 100.</li>
7676
<li>bevelEnabled — bool. Apply beveling to the shape. Default is true.</li>
7777
<li>bevelThickness — float. How deep into the original shape the bevel goes. Default is 6.</li>
7878
<li>bevelSize — float. Distance from the shape outline that the bevel extends. Default is bevelThickness - 2.</li>

‎docs/api/geometries/ExtrudeGeometry.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h2>Example</h2>
4747

4848
var extrudeSettings = {
4949
steps: 2,
50-
amount: 16,
50+
depth: 16,
5151
bevelEnabled: true,
5252
bevelThickness: 1,
5353
bevelSize: 1,
@@ -72,7 +72,7 @@ <h3>[name]([param:Array shapes], [param:Object options])</h3>
7272
<ul>
7373
<li>curveSegments — int. Number of points on the curves. Default is 12.</li>
7474
<li>steps — int. Number of points used for subdividing segments along the depth of the extruded spline. Default is 1.</li>
75-
<li>amount — float. Depth to extrude the shape. Default is 100.</li>
75+
<li>depth — float. Depth to extrude the shape. Default is 100.</li>
7676
<li>bevelEnabled — bool. Apply beveling to the shape. Default is true.</li>
7777
<li>bevelThickness — float. How deep into the original shape the bevel goes. Default is 6.</li>
7878
<li>bevelSize — float. Distance from the shape outline that the bevel extends. Default is bevelThickness - 2.</li>

‎docs/scenes/js/geometry.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ var guis = {
12641264

12651265
var data = {
12661266
steps: 2,
1267-
amount: 16,
1267+
depth: 16,
12681268
bevelEnabled: true,
12691269
bevelThickness: 1,
12701270
bevelSize: 1,
@@ -1292,7 +1292,7 @@ var guis = {
12921292
var folder = gui.addFolder( 'THREE.ExtrudeGeometry' );
12931293

12941294
folder.add( data, 'steps', 1, 10 ).step( 1 ).onChange( generateGeometry );
1295-
folder.add( data, 'amount', 1, 20 ).onChange( generateGeometry );
1295+
folder.add( data, 'depth', 1, 20 ).onChange( generateGeometry );
12961296
folder.add( data, 'bevelThickness', 1, 5 ).step( 1 ).onChange( generateGeometry );
12971297
folder.add( data, 'bevelSize', 1, 5 ).step( 1 ).onChange( generateGeometry );
12981298
folder.add( data, 'bevelSegments', 1, 5 ).step( 1 ).onChange( generateGeometry );
@@ -1305,7 +1305,7 @@ var guis = {
13051305

13061306
var data = {
13071307
steps: 2,
1308-
amount: 16,
1308+
depth: 16,
13091309
bevelEnabled: true,
13101310
bevelThickness: 1,
13111311
bevelSize: 1,
@@ -1333,7 +1333,7 @@ var guis = {
13331333
var folder = gui.addFolder( 'THREE.ExtrudeBufferGeometry' );
13341334

13351335
folder.add( data, 'steps', 1, 10 ).step( 1 ).onChange( generateGeometry );
1336-
folder.add( data, 'amount', 1, 20 ).onChange( generateGeometry );
1336+
folder.add( data, 'depth', 1, 20 ).onChange( generateGeometry );
13371337
folder.add( data, 'bevelThickness', 1, 5 ).step( 1 ).onChange( generateGeometry );
13381338
folder.add( data, 'bevelSize', 1, 5 ).step( 1 ).onChange( generateGeometry );
13391339
folder.add( data, 'bevelSegments', 1, 5 ).step( 1 ).onChange( generateGeometry );

‎examples/webgl_buffergeometry_constructed_from_geometry.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
heartShape.bezierCurveTo( x + 35, y, x + 25, y + 25, x + 25, y + 25 );
9494

9595
var extrudeSettings = {
96-
amount: 16,
96+
depth: 16,
9797
bevelEnabled: true,
9898
bevelSegments: 1,
9999
steps: 2,

‎examples/webgl_geometry_extrude_shapes.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
var materials = [ material, material2 ];
158158

159159
var extrudeSettings = {
160-
amount: 20,
160+
depth: 20,
161161
steps: 1,
162162
bevelEnabled: true,
163163
bevelThickness : 2,

‎examples/webgl_geometry_extrude_shapes2.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@
351351
var addGeoObject = function( group, svgObject ) {
352352

353353
var paths = svgObject.paths;
354-
var amounts = svgObject.amounts;
354+
var depths = svgObject.depths;
355355
var colors = svgObject.colors;
356356
var center = svgObject.center;
357357

@@ -363,20 +363,20 @@
363363
color: color,
364364
emissive: color
365365
} );
366-
var amount = amounts[ i ];
366+
var depth = depths[ i ];
367367
var simpleShapes = path.toShapes( true );
368368

369369
for ( var j = 0; j < simpleShapes.length; j ++ ) {
370370

371371
var simpleShape = simpleShapes[ j ];
372372
var shape3d = new THREE.ExtrudeBufferGeometry( simpleShape, {
373-
amount: amount,
373+
depth: depth,
374374
bevelEnabled: false
375375
} );
376376

377377
var mesh = new THREE.Mesh( shape3d, material );
378378
mesh.rotation.x = Math.PI;
379-
mesh.translateZ( - amount - 1 );
379+
mesh.translateZ( - depth - 1 );
380380
mesh.translateX( - center.x );
381381
mesh.translateY( - center.y );
382382

@@ -492,7 +492,7 @@
492492
"L368.1217,110.4867 L366.5152,109.2554 L361.9554,112.3435 L358.1163,117.8678 L361.7218,120.2192 " +
493493
"L360.7261,126.3232 L362.8064,125.5221 Z"];
494494

495-
obj.amounts = [ 19, 20, 21 ];
495+
obj.depths = [ 19, 20, 21 ];
496496
obj.colors = [ 0xC07000, 0xC08000, 0xC0A000 ];
497497
obj.center = { x: 365, y: 125 };
498498

‎examples/webgl_geometry_shapes.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
splineShape.moveTo( 0, 0 );
343343
splineShape.splineThru( splinepts );
344344

345-
var extrudeSettings = { amount: 8, bevelEnabled: true, bevelSegments: 2, steps: 2, bevelSize: 1, bevelThickness: 1 };
345+
var extrudeSettings = { depth: 8, bevelEnabled: true, bevelSegments: 2, steps: 2, bevelSize: 1, bevelThickness: 1 };
346346

347347
// addShape( shape, color, x, y, z, rx, ry,rz, s );
348348

‎src/geometries/ExtrudeGeometry.js‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* curveSegments: <int>, // number of points on the curves
99
* steps: <int>, // number of points for z-side extrusions / used for subdividing segments of extrude spline too
10-
* amount: <float>, // Depth to extrude the shape
10+
* depth: <float>, // Depth to extrude the shape
1111
*
1212
* bevelEnabled: <bool>, // turn on bevel
1313
* bevelThickness: <float>, // how deep into the original shape bevel goes
@@ -93,7 +93,7 @@ function ExtrudeBufferGeometry( shapes, options ) {
9393

9494
var curveSegments = options.curveSegments !== undefined ? options.curveSegments : 12;
9595
var steps = options.steps !== undefined ? options.steps : 1;
96-
var amount = options.amount !== undefined ? options.amount : 100;
96+
var depth = options.depth !== undefined ? options.depth : 100;
9797

9898
var bevelEnabled = options.bevelEnabled !== undefined ? options.bevelEnabled : true;
9999
var bevelThickness = options.bevelThickness !== undefined ? options.bevelThickness : 6;
@@ -104,6 +104,15 @@ function ExtrudeBufferGeometry( shapes, options ) {
104104

105105
var uvgen = options.UVGenerator !== undefined ? options.UVGenerator : WorldUVGenerator;
106106

107+
// deprecated options
108+
109+
if ( options.amount !== undefined ) {
110+
111+
console.warn( 'THREE.ExtrudeBufferGeometry: amount has been renamed to depth.' );
112+
depth = options.amount;
113+
114+
}
115+
107116
//
108117

109118
var extrudePts, extrudeByPath = false;
@@ -444,7 +453,7 @@ function ExtrudeBufferGeometry( shapes, options ) {
444453

445454
if ( ! extrudeByPath ) {
446455

447-
v( vert.x, vert.y, amount / steps * s );
456+
v( vert.x, vert.y, depth / steps * s );
448457

449458
} else {
450459

@@ -478,7 +487,7 @@ function ExtrudeBufferGeometry( shapes, options ) {
478487
for ( i = 0, il = contour.length; i < il; i ++ ) {
479488

480489
vert = scalePt2( contour[ i ], contourMovements[ i ], bs );
481-
v( vert.x, vert.y, amount + z );
490+
v( vert.x, vert.y, depth + z );
482491

483492
}
484493

@@ -495,7 +504,7 @@ function ExtrudeBufferGeometry( shapes, options ) {
495504

496505
if ( ! extrudeByPath ) {
497506

498-
v( vert.x, vert.y, amount + z );
507+
v( vert.x, vert.y, depth + z );
499508

500509
} else {
501510

‎src/geometries/TextGeometry.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function TextBufferGeometry( text, parameters ) {
6060

6161
// translate parameters to ExtrudeGeometry API
6262

63-
parameters.amount = parameters.height !== undefined ? parameters.height : 50;
63+
parameters.depth = parameters.height !== undefined ? parameters.height : 50;
6464

6565
// defaults
6666

‎test/unit/src/geometries/ExtrudeGeometry.tests.js‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -41,35 +41,6 @@ export default QUnit.module( 'Geometries', () => {
4141

4242
} );
4343

44-
// STATIC STUFF
45-
QUnit.todo( "WorldUVGenerator.generateTopUV", ( assert ) => {
46-
47-
assert.ok( false, "everything's gonna be alright" );
48-
49-
} );
50-
QUnit.todo( "WorldUVGenerator.generateSideWallUV", ( assert ) => {
51-
52-
assert.ok( false, "everything's gonna be alright" );
53-
54-
} );
55-
56-
// OTHERS
57-
QUnit.todo( "getArrays", ( assert ) => {
58-
59-
assert.ok( false, "everything's gonna be alright" );
60-
61-
} );
62-
QUnit.todo( "addShapeList", ( assert ) => {
63-
64-
assert.ok( false, "everything's gonna be alright" );
65-
66-
} );
67-
QUnit.todo( "addShape", ( assert ) => {
68-
69-
assert.ok( false, "everything's gonna be alright" );
70-
71-
} );
72-
7344

7445
} );
7546

0 commit comments

Comments
 (0)