Skip to content

Commit db3cdee

Browse files
authored
Merge pull request #15153 from WestLangley/dev-cleanup_undefined
Cleanup
2 parents 4b217f8 + 9a3441c commit db3cdee

File tree

5 files changed

+34
-37
lines changed

5 files changed

+34
-37
lines changed

examples/js/geometries/hilbert2D.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,18 @@
1515
* @param v2 Corner index +X, +Z.
1616
* @param v3 Corner index +X, -Z.
1717
*/
18+
1819
function hilbert2D( center, size, iterations, v0, v1, v2, v3 ) {
1920

2021
// Default Vars
21-
var center = undefined !== center ? center : new THREE.Vector3( 0, 0, 0 ),
22-
size = undefined !== size ? size : 10,
22+
var center = center !== undefined ? center : new THREE.Vector3( 0, 0, 0 ),
23+
size = size !== undefined ? size : 10,
2324
half = size / 2,
24-
iterations = undefined !== iterations ? iterations : 1,
25-
v0 = undefined !== v0 ? v0 : 0,
26-
v1 = undefined !== v1 ? v1 : 1,
27-
v2 = undefined !== v2 ? v2 : 2,
28-
v3 = undefined !== v3 ? v3 : 3
25+
iterations = iterations !== undefined ? iterations : 1,
26+
v0 = v0 !== undefined ? v0 : 0,
27+
v1 = v1 !== undefined ? v1 : 1,
28+
v2 = v2 !== undefined ? v2 : 2,
29+
v3 = v3 !== undefined ? v3 : 3
2930
;
3031

3132
var vec_s = [

examples/js/geometries/hilbert3D.js

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
* @author Thomas Diewald
88
* @link http://www.openprocessing.org/visuals/?visualID=15599
99
*
10-
* Based on `examples/canvas_lines_colors.html`:
11-
* @author OpenShift guest
12-
* @link https://github.com/mrdoob/three.js/blob/8413a860aa95ed29c79cbb7f857c97d7880d260f/examples/canvas_lines_colors.html
13-
* @see Line 149 - 186
14-
*
1510
* @param center Center of Hilbert curve.
1611
* @param size Total width of Hilbert curve.
1712
* @param iterations Number of subdivisions.
@@ -24,21 +19,22 @@
2419
* @param v6 Corner index +X, +Y, +Z.
2520
* @param v7 Corner index +X, +Y, -Z.
2621
*/
22+
2723
function hilbert3D( center, size, iterations, v0, v1, v2, v3, v4, v5, v6, v7 ) {
2824

2925
// Default Vars
30-
var center = undefined !== center ? center : new THREE.Vector3( 0, 0, 0 ),
31-
size = undefined !== size ? size : 10,
26+
var center = center !== undefined ? center : new THREE.Vector3( 0, 0, 0 ),
27+
size = size !== undefined ? size : 10,
3228
half = size / 2,
33-
iterations = undefined !== iterations ? iterations : 1,
34-
v0 = undefined !== v0 ? v0 : 0,
35-
v1 = undefined !== v1 ? v1 : 1,
36-
v2 = undefined !== v2 ? v2 : 2,
37-
v3 = undefined !== v3 ? v3 : 3,
38-
v4 = undefined !== v4 ? v4 : 4,
39-
v5 = undefined !== v5 ? v5 : 5,
40-
v6 = undefined !== v6 ? v6 : 6,
41-
v7 = undefined !== v7 ? v7 : 7
29+
iterations = iterations !== undefined ? iterations : 1,
30+
v0 = v0 !== undefined ? v0 : 0,
31+
v1 = v1 !== undefined ? v1 : 1,
32+
v2 = v2 !== undefined ? v2 : 2,
33+
v3 = v3 !== undefined ? v3 : 3,
34+
v4 = v4 !== undefined ? v4 : 4,
35+
v5 = v5 !== undefined ? v5 : 5,
36+
v6 = v6 !== undefined ? v6 : 6,
37+
v7 = v7 !== undefined ? v7 : 7
4238
;
4339

4440
var vec_s = [

examples/js/loaders/HDRCubeTextureLoader.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ THREE.HDRCubeTextureLoader.prototype.load = function ( type, urls, onLoad, onPro
147147

148148
}
149149

150-
if ( undefined !== texData.image ) {
150+
if ( texData.image !== undefined ) {
151151

152152
texture[ i ].images = texData.image;
153153

154-
} else if ( undefined !== texData.data ) {
154+
} else if ( texData.data !== undefined ) {
155155

156156
var dataTexture = new THREE.DataTexture( texData.data, texData.width, texData.height );
157157
dataTexture.format = texture.format;

examples/js/loaders/VRMLLoader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ THREE.VRMLLoader.prototype = {
626626
parent.geometry = defines[ defineKey ].clone();
627627

628628
// the solid property is not cloned with clone(), is only needed for VRML loading, so we need to transfer it
629-
if ( undefined !== defines[ defineKey ].solid && defines[ defineKey ].solid === false ) {
629+
if ( defines[ defineKey ].solid !== undefined && defines[ defineKey ].solid === false ) {
630630

631631
parent.geometry.solid = false;
632632
parent.material.side = THREE.DoubleSide;

src/loaders/DataTextureLoader.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,44 +35,44 @@ Object.assign( DataTextureLoader.prototype, {
3535

3636
if ( ! texData ) return;
3737

38-
if ( undefined !== texData.image ) {
38+
if ( texData.image !== undefined ) {
3939

4040
texture.image = texData.image;
4141

42-
} else if ( undefined !== texData.data ) {
42+
} else if ( texData.data !== undefined ) {
4343

4444
texture.image.width = texData.width;
4545
texture.image.height = texData.height;
4646
texture.image.data = texData.data;
4747

4848
}
4949

50-
texture.wrapS = undefined !== texData.wrapS ? texData.wrapS : ClampToEdgeWrapping;
51-
texture.wrapT = undefined !== texData.wrapT ? texData.wrapT : ClampToEdgeWrapping;
50+
texture.wrapS = texData.wrapS !== undefined ? texData.wrapS : ClampToEdgeWrapping;
51+
texture.wrapT = texData.wrapT !== undefined ? texData.wrapT : ClampToEdgeWrapping;
5252

53-
texture.magFilter = undefined !== texData.magFilter ? texData.magFilter : LinearFilter;
54-
texture.minFilter = undefined !== texData.minFilter ? texData.minFilter : LinearMipMapLinearFilter;
53+
texture.magFilter = texData.magFilter !== undefined ? texData.magFilter : LinearFilter;
54+
texture.minFilter = texData.minFilter !== undefined ? texData.minFilter : LinearMipMapLinearFilter;
5555

56-
texture.anisotropy = undefined !== texData.anisotropy ? texData.anisotropy : 1;
56+
texture.anisotropy = texData.anisotropy !== undefined ? texData.anisotropy : 1;
5757

58-
if ( undefined !== texData.format ) {
58+
if ( texData.format !== undefined ) {
5959

6060
texture.format = texData.format;
6161

6262
}
63-
if ( undefined !== texData.type ) {
63+
if ( texData.type !== undefined ) {
6464

6565
texture.type = texData.type;
6666

6767
}
6868

69-
if ( undefined !== texData.mipmaps ) {
69+
if ( texData.mipmaps !== undefined ) {
7070

7171
texture.mipmaps = texData.mipmaps;
7272

7373
}
7474

75-
if ( 1 === texData.mipmapCount ) {
75+
if ( texData.mipmapCount === 1 ) {
7676

7777
texture.minFilter = LinearFilter;
7878

0 commit comments

Comments
 (0)