Skip to content
Merged

Cleanup #15153

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions examples/js/geometries/hilbert2D.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,18 @@
* @param v2 Corner index +X, +Z.
* @param v3 Corner index +X, -Z.
*/

function hilbert2D( center, size, iterations, v0, v1, v2, v3 ) {

// Default Vars
var center = undefined !== center ? center : new THREE.Vector3( 0, 0, 0 ),
size = undefined !== size ? size : 10,
var center = center !== undefined ? center : new THREE.Vector3( 0, 0, 0 ),
size = size !== undefined ? size : 10,
half = size / 2,
iterations = undefined !== iterations ? iterations : 1,
v0 = undefined !== v0 ? v0 : 0,
v1 = undefined !== v1 ? v1 : 1,
v2 = undefined !== v2 ? v2 : 2,
v3 = undefined !== v3 ? v3 : 3
iterations = iterations !== undefined ? iterations : 1,
v0 = v0 !== undefined ? v0 : 0,
v1 = v1 !== undefined ? v1 : 1,
v2 = v2 !== undefined ? v2 : 2,
v3 = v3 !== undefined ? v3 : 3
;

var vec_s = [
Expand Down
28 changes: 12 additions & 16 deletions examples/js/geometries/hilbert3D.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
* @author Thomas Diewald
* @link http://www.openprocessing.org/visuals/?visualID=15599
*
* Based on `examples/canvas_lines_colors.html`:
* @author OpenShift guest
* @link https://github.com/mrdoob/three.js/blob/8413a860aa95ed29c79cbb7f857c97d7880d260f/examples/canvas_lines_colors.html
* @see Line 149 - 186
*
* @param center Center of Hilbert curve.
* @param size Total width of Hilbert curve.
* @param iterations Number of subdivisions.
Expand All @@ -24,21 +19,22 @@
* @param v6 Corner index +X, +Y, +Z.
* @param v7 Corner index +X, +Y, -Z.
*/

function hilbert3D( center, size, iterations, v0, v1, v2, v3, v4, v5, v6, v7 ) {

// Default Vars
var center = undefined !== center ? center : new THREE.Vector3( 0, 0, 0 ),
size = undefined !== size ? size : 10,
var center = center !== undefined ? center : new THREE.Vector3( 0, 0, 0 ),
size = size !== undefined ? size : 10,
half = size / 2,
iterations = undefined !== iterations ? iterations : 1,
v0 = undefined !== v0 ? v0 : 0,
v1 = undefined !== v1 ? v1 : 1,
v2 = undefined !== v2 ? v2 : 2,
v3 = undefined !== v3 ? v3 : 3,
v4 = undefined !== v4 ? v4 : 4,
v5 = undefined !== v5 ? v5 : 5,
v6 = undefined !== v6 ? v6 : 6,
v7 = undefined !== v7 ? v7 : 7
iterations = iterations !== undefined ? iterations : 1,
v0 = v0 !== undefined ? v0 : 0,
v1 = v1 !== undefined ? v1 : 1,
v2 = v2 !== undefined ? v2 : 2,
v3 = v3 !== undefined ? v3 : 3,
v4 = v4 !== undefined ? v4 : 4,
v5 = v5 !== undefined ? v5 : 5,
v6 = v6 !== undefined ? v6 : 6,
v7 = v7 !== undefined ? v7 : 7
;

var vec_s = [
Expand Down
4 changes: 2 additions & 2 deletions examples/js/loaders/HDRCubeTextureLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,11 @@ THREE.HDRCubeTextureLoader.prototype.load = function ( type, urls, onLoad, onPro

}

if ( undefined !== texData.image ) {
if ( texData.image !== undefined ) {

texture[ i ].images = texData.image;

} else if ( undefined !== texData.data ) {
} else if ( texData.data !== undefined ) {

var dataTexture = new THREE.DataTexture( texData.data, texData.width, texData.height );
dataTexture.format = texture.format;
Expand Down
2 changes: 1 addition & 1 deletion examples/js/loaders/VRMLLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ THREE.VRMLLoader.prototype = {
parent.geometry = defines[ defineKey ].clone();

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

parent.geometry.solid = false;
parent.material.side = THREE.DoubleSide;
Expand Down
22 changes: 11 additions & 11 deletions src/loaders/DataTextureLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,44 +35,44 @@ Object.assign( DataTextureLoader.prototype, {

if ( ! texData ) return;

if ( undefined !== texData.image ) {
if ( texData.image !== undefined ) {

texture.image = texData.image;

} else if ( undefined !== texData.data ) {
} else if ( texData.data !== undefined ) {

texture.image.width = texData.width;
texture.image.height = texData.height;
texture.image.data = texData.data;

}

texture.wrapS = undefined !== texData.wrapS ? texData.wrapS : ClampToEdgeWrapping;
texture.wrapT = undefined !== texData.wrapT ? texData.wrapT : ClampToEdgeWrapping;
texture.wrapS = texData.wrapS !== undefined ? texData.wrapS : ClampToEdgeWrapping;
texture.wrapT = texData.wrapT !== undefined ? texData.wrapT : ClampToEdgeWrapping;

texture.magFilter = undefined !== texData.magFilter ? texData.magFilter : LinearFilter;
texture.minFilter = undefined !== texData.minFilter ? texData.minFilter : LinearMipMapLinearFilter;
texture.magFilter = texData.magFilter !== undefined ? texData.magFilter : LinearFilter;
texture.minFilter = texData.minFilter !== undefined ? texData.minFilter : LinearMipMapLinearFilter;

texture.anisotropy = undefined !== texData.anisotropy ? texData.anisotropy : 1;
texture.anisotropy = texData.anisotropy !== undefined ? texData.anisotropy : 1;

if ( undefined !== texData.format ) {
if ( texData.format !== undefined ) {

texture.format = texData.format;

}
if ( undefined !== texData.type ) {
if ( texData.type !== undefined ) {

texture.type = texData.type;

}

if ( undefined !== texData.mipmaps ) {
if ( texData.mipmaps !== undefined ) {

texture.mipmaps = texData.mipmaps;

}

if ( 1 === texData.mipmapCount ) {
if ( texData.mipmapCount === 1 ) {

texture.minFilter = LinearFilter;

Expand Down