diff --git a/editor/js/History.js b/editor/js/History.js index cb0338259290aaa6ca2357997bf1d1f4d162640c..d5830442182e6fe7d2853712cc5e9575835ed020 100644 --- a/editor/js/History.js +++ b/editor/js/History.js @@ -273,7 +273,7 @@ History.prototype = { if ( cmd === undefined || id === cmd.id ) break; - cmd = this.undo(); + this.undo(); } diff --git a/examples/js/WaterShader.js b/examples/js/WaterShader.js index 24cef110e84335fabb51c18da5d5da2c67b8bd43..e1ba9218d2e59284ee2d7699dbe7381217c4e08d 100644 --- a/examples/js/WaterShader.js +++ b/examples/js/WaterShader.js @@ -307,8 +307,7 @@ THREE.Water.prototype.updateTextureMatrix = function () { q.w = ( 1.0 + projectionMatrix.elements[ 10 ] ) / projectionMatrix.elements[ 14 ]; // Calculate the scaled plane vector - var c = new THREE.Vector4(); - c = this.clipPlane.multiplyScalar( 2.0 / this.clipPlane.dot( q ) ); + var c = this.clipPlane.multiplyScalar( 2.0 / this.clipPlane.dot( q ) ); // Replacing the third row of the projection matrix projectionMatrix.elements[ 2 ] = c.x; diff --git a/examples/js/geometries/TeapotBufferGeometry.js b/examples/js/geometries/TeapotBufferGeometry.js index 296327346791ffe1e9d172f1e26434275a28b821..7d6c6ff133ab985ef317d6c4044bf666b11a2550 100644 --- a/examples/js/geometries/TeapotBufferGeometry.js +++ b/examples/js/geometries/TeapotBufferGeometry.js @@ -479,7 +479,7 @@ THREE.TeapotBufferGeometry = function ( size, segments, bottom, lid, body, fitLi var tcoord; var sstep, tstep; - var vertPerRow, eps; + var vertPerRow; var s, t, sval, tval, p; var dsval = 0; @@ -532,8 +532,6 @@ THREE.TeapotBufferGeometry = function ( size, segments, bottom, lid, body, fitLi vertPerRow = segments + 1; - eps = 0.0000001; - var surfCount = 0; var vertCount = 0; diff --git a/examples/js/loaders/AWDLoader.js b/examples/js/loaders/AWDLoader.js index d320e04cf9dacd4548fd67ee72f4a80ec3cd3c77..db01410d0e4367ae5238d26b723ca4da6d90f23b 100644 --- a/examples/js/loaders/AWDLoader.js +++ b/examples/js/loaders/AWDLoader.js @@ -288,7 +288,6 @@ mtx, materials, mat, mat_id, num_materials, - materials_parsed, parent, i; @@ -301,7 +300,6 @@ geometries = this.getBlock( data_id ); materials = []; - materials_parsed = 0; for ( i = 0; i < num_materials; i ++ ) { diff --git a/examples/js/loaders/AssimpLoader.js b/examples/js/loaders/AssimpLoader.js index 17674703b804419cd5052336a8dd9fa86937adda..4ef813022e35b708081be6ae105ad9ea1d4f611d 100644 --- a/examples/js/loaders/AssimpLoader.js +++ b/examples/js/loaders/AssimpLoader.js @@ -493,16 +493,6 @@ } - function aiAnimation() { - - this.mName = ""; - this.mDuration = 0; - this.mTicksPerSecond = 0; - this.mNumChannels = 0; - this.mChannels = []; - - } - function sortWeights( indexes, weights ) { var pairs = []; diff --git a/examples/js/loaders/BinaryLoader.js b/examples/js/loaders/BinaryLoader.js index 49333e1fefc70eadaddefb39b51891afa8227a05..3786cd7a7d4dd1154a3639b9c8deb9e08d5fd06e 100644 --- a/examples/js/loaders/BinaryLoader.js +++ b/examples/js/loaders/BinaryLoader.js @@ -92,7 +92,7 @@ THREE.BinaryLoader.prototype = { start_quad_flat, start_quad_smooth, start_quad_flat_uv, start_quad_smooth_uv, tri_size, quad_size, len_tri_flat, len_tri_smooth, len_tri_flat_uv, len_tri_smooth_uv, - len_quad_flat, len_quad_smooth, len_quad_flat_uv, len_quad_smooth_uv; + len_quad_flat, len_quad_smooth, len_quad_flat_uv; THREE.Geometry.call( this ); @@ -119,7 +119,6 @@ THREE.BinaryLoader.prototype = { len_quad_flat = md.nquad_flat * ( quad_size ); len_quad_smooth = md.nquad_smooth * ( quad_size + md.normal_index_bytes * 4 ); len_quad_flat_uv = md.nquad_flat_uv * ( quad_size + md.uv_index_bytes * 4 ); - len_quad_smooth_uv = md.nquad_smooth_uv * ( quad_size + md.normal_index_bytes * 4 + md.uv_index_bytes * 4 ); // read buffers diff --git a/examples/js/loaders/ColladaLoader.js b/examples/js/loaders/ColladaLoader.js index 3c8fa2df20de87867a15e1a976ff72dee07e1e9d..93eff98a583ddecc09304fd96634a3c155f47a63 100644 --- a/examples/js/loaders/ColladaLoader.js +++ b/examples/js/loaders/ColladaLoader.js @@ -682,11 +682,11 @@ THREE.ColladaLoader = function () { } - function applySkin ( geometry, instanceCtrl, frame ) { + function applySkin( geometry, instanceCtrl, frame ) { - var skinController = controllers[ instanceCtrl.url ]; + if ( frame === undefined ) frame = 40; - frame = frame !== undefined ? frame : 40; + var skinController = controllers[ instanceCtrl.url ]; if ( !skinController || !skinController.skin ) { @@ -2171,13 +2171,11 @@ THREE.ColladaLoader = function () { var dotSyntax = (sid.indexOf(".") >= 0); var arrSyntax = (sid.indexOf("(") >= 0); var arrIndices; - var member; if ( dotSyntax ) { parts = sid.split("."); sid = parts.shift(); - member = parts.shift(); } else if ( arrSyntax ) { @@ -2871,7 +2869,7 @@ THREE.ColladaLoader = function () { var j, k, pList = primitive.p, inputs = primitive.inputs; var input, index, idx32; var source, numParams; - var vcIndex = 0, vcount = 3, maxOffset = 0; + var vcount, vcIndex = 0, maxOffset = 0; var texture_sets = []; for ( j = 0; j < inputs.length; j ++ ) { diff --git a/examples/js/loaders/NRRDLoader.js b/examples/js/loaders/NRRDLoader.js index ceabdd7fc8d12b2213b5c10b438740e613650904..946f3e159cd1f2367b5e177b1a133df89f8444f7 100644 --- a/examples/js/loaders/NRRDLoader.js +++ b/examples/js/loaders/NRRDLoader.js @@ -367,13 +367,6 @@ THREE.NRRDLoader.prototype = { } else { var v = headerObject.vectors; - var origin = headerObject.space_origin; - - if ( ! origin ) { - - origin = [ 0, 0, 0 ]; - - } volume.matrix.set( _spaceX * v[ 0 ][ 0 ], _spaceX * v[ 1 ][ 0 ], _spaceX * v[ 2 ][ 0 ], 0, _spaceY * v[ 0 ][ 1 ], _spaceY * v[ 1 ][ 1 ], _spaceY * v[ 2 ][ 1 ], 0, diff --git a/examples/js/loaders/PVRLoader.js b/examples/js/loaders/PVRLoader.js index c5b331bd14024286e2c394038ac571c0c8657295..b7a13b53c2388647f59ac81bea74f83ec5d520eb 100644 --- a/examples/js/loaders/PVRLoader.js +++ b/examples/js/loaders/PVRLoader.js @@ -1,4 +1,4 @@ -/* +/* * PVRLoader * Author: pierre lepers * Date: 17/09/2014 11:09 @@ -36,7 +36,7 @@ THREE.PVRLoader.parse = function ( buffer, loadMipmaps ) { return THREE.PVRLoader._parseV3( pvrDatas ); - } + } // PVR v2 else if ( header[ 11 ] === 0x21525650 ) { @@ -51,10 +51,10 @@ THREE.PVRLoader.parse = function ( buffer, loadMipmaps ) { }; THREE.PVRLoader._parseV3 = function ( pvrDatas ) { - + var header = pvrDatas.header; var bpp, format; - + var metaLen = header[ 12 ], pixelFormat = header[ 2 ], @@ -109,7 +109,7 @@ THREE.PVRLoader._parseV2 = function ( pvrDatas ) { numMipmaps = header[ 3 ], flags = header[ 4 ], dataLength = header[ 5 ], - bpp = header[ 6 ], + // bpp = header[ 6 ], bitmaskRed = header[ 7 ], bitmaskGreen = header[ 8 ], bitmaskBlue = header[ 9 ], @@ -141,7 +141,7 @@ THREE.PVRLoader._parseV2 = function ( pvrDatas ) { } else throw new Error( "pvrtc - unknown format " + formatFlags ); - + pvrDatas.dataPtr = headerLength; @@ -162,14 +162,14 @@ THREE.PVRLoader._parseV2 = function ( pvrDatas ) { THREE.PVRLoader._extract = function ( pvrDatas ) { - + var pvr = { - mipmaps: [], - width: pvrDatas.width, - height: pvrDatas.height, - format: pvrDatas.format, - mipmapCount: pvrDatas.numMipmaps, - isCubemap : pvrDatas.isCubemap + mipmaps: [], + width: pvrDatas.width, + height: pvrDatas.height, + format: pvrDatas.format, + mipmapCount: pvrDatas.numMipmaps, + isCubemap : pvrDatas.isCubemap }; var buffer = pvrDatas.buffer; @@ -246,10 +246,10 @@ THREE.PVRLoader._extract = function ( pvrDatas ) { var byteArray = new Uint8Array( buffer, dataOffset, dataSize ); - var mipmap = { - data: byteArray, - width: sWidth, - height: sHeight + var mipmap = { + data: byteArray, + width: sWidth, + height: sHeight }; pvr.mipmaps[ surfIndex * pvrDatas.numMipmaps + mipLevel ] = mipmap; diff --git a/examples/js/loaders/VRMLLoader.js b/examples/js/loaders/VRMLLoader.js index 82711ccb7fb4af76d68cae0a75d687c25fd4dec7..a3a1c94f65da39363427de48ed1dbb77911501c1 100644 --- a/examples/js/loaders/VRMLLoader.js +++ b/examples/js/loaders/VRMLLoader.js @@ -114,22 +114,20 @@ THREE.VRMLLoader.prototype = { */ var paintFaces = function ( geometry, radius, angles, colors, directionIsDown ) { - var f, n, p, vertexIndex, color; - var direction = directionIsDown ? 1 : - 1; var faceIndices = [ 'a', 'b', 'c', 'd' ]; - var coord = [ ], aColor, bColor, t = 1, A = {}, B = {}, applyColor = false, colorIndex; + var coord = [], A = {}, B = {}, applyColor = false; for ( var k = 0; k < angles.length; k ++ ) { - var vec = { }; - // push the vector at which the color changes - vec.y = direction * ( Math.cos( angles[ k ] ) * radius ); - vec.x = direction * ( Math.sin( angles[ k ] ) * radius ); + var vec = { + x: direction * ( Math.cos( angles[ k ] ) * radius ), + y: direction * ( Math.sin( angles[ k ] ) * radius ) + }; coord.push( vec ); @@ -138,15 +136,15 @@ THREE.VRMLLoader.prototype = { // painting the colors on the faces for ( var i = 0; i < geometry.faces.length ; i ++ ) { - f = geometry.faces[ i ]; + var f = geometry.faces[ i ]; - n = ( f instanceof THREE.Face3 ) ? 3 : 4; + var n = ( f instanceof THREE.Face3 ) ? 3 : 4; for ( var j = 0; j < n; j ++ ) { - vertexIndex = f[ faceIndices[ j ] ]; + var vertexIndex = f[ faceIndices[ j ] ]; - p = geometry.vertices[ vertexIndex ]; + var p = geometry.vertices[ vertexIndex ]; for ( var index = 0; index < colors.length; index ++ ) { @@ -174,15 +172,14 @@ THREE.VRMLLoader.prototype = { if ( applyColor ) { - bColor = colors[ index + 1 ]; - - aColor = colors[ index ]; + var aColor = colors[ index ]; + var bColor = colors[ index + 1 ]; // below is simple linear interpolation - t = Math.abs( p.y - A.y ) / ( A.y - B.y ); + var t = Math.abs( p.y - A.y ) / ( A.y - B.y ); // to make it faster, you can only calculate this if the y coord changes, the color is the same for points with the same y - color = interpolateColors( aColor, bColor, t ); + var color = interpolateColors( aColor, bColor, t ); f.vertexColors[ j ] = color; @@ -190,7 +187,7 @@ THREE.VRMLLoader.prototype = { } else if ( undefined === f.vertexColors[ j ] ) { - colorIndex = directionIsDown ? colors.length - 1 : 0; + var colorIndex = directionIsDown ? colors.length - 1 : 0; f.vertexColors[ j ] = colors[ colorIndex ]; } @@ -1025,8 +1022,6 @@ THREE.VRMLLoader.prototype = { for ( var i = 0, l = data.children.length; i < l; i ++ ) { - var child = data.children[ i ]; - parseNode( data.children[ i ], object ); } diff --git a/examples/js/math/Lut.js b/examples/js/math/Lut.js index 230cff840817d323c000c9be6cfd4023c5ae6543..0190ab7ed4f5361c447a86fb716a8fd231539a13 100644 --- a/examples/js/math/Lut.js +++ b/examples/js/math/Lut.js @@ -20,11 +20,10 @@ THREE.Lut = function ( colormap, numberofcolors ) { var min = this.map[ j ][ 0 ]; var max = this.map[ j + 1 ][ 0 ]; - var color = new THREE.Color( 0xffffff ); var minColor = new THREE.Color( 0xffffff ).setHex( this.map[ j ][ 1 ] ); var maxColor = new THREE.Color( 0xffffff ).setHex( this.map[ j + 1 ][ 1 ] ); - color = minColor.lerp( maxColor, ( i - min ) / ( max - min ) ); + var color = minColor.lerp( maxColor, ( i - min ) / ( max - min ) ); this.lut.push( color ); @@ -176,10 +175,11 @@ THREE.Lut.prototype = { var min = this.map[ j - 1 ][ 0 ]; var max = this.map[ j ][ 0 ]; - var color = new THREE.Color( 0xffffff ); + var minColor = new THREE.Color( 0xffffff ).setHex( this.map[ j - 1 ][ 1 ] ); var maxColor = new THREE.Color( 0xffffff ).setHex( this.map[ j ][ 1 ] ); - color = minColor.lerp( maxColor, ( i - min ) / ( max - min ) ); + + var color = minColor.lerp( maxColor, ( i - min ) / ( max - min ) ); data[ k * 4 ] = Math.round( color.r * 255 ); data[ k * 4 + 1 ] = Math.round( color.g * 255 ); diff --git a/examples/js/modifiers/BufferSubdivisionModifier.js b/examples/js/modifiers/BufferSubdivisionModifier.js index 1697feac34f0d68213cb16e695a70cd852ec21a1..63f2027a51ae94afddf48269b87e8809041f7c97 100644 --- a/examples/js/modifiers/BufferSubdivisionModifier.js +++ b/examples/js/modifiers/BufferSubdivisionModifier.js @@ -242,7 +242,6 @@ function compute_vertex_normals( geometry ) { } - var tmpx, tmpy, tmpz; var t_len; for ( var i = 0, il = oldFaces.length; i < il; i++ ) { @@ -268,10 +267,6 @@ function compute_vertex_normals( geometry ) { full_weights[ 1 ] = ( my_weight / newNormalFaces.buffer[ oldFaces.register[ 0 ].b ] ); full_weights[ 2 ] = ( my_weight / newNormalFaces.buffer[ oldFaces.register[ 0 ].c ] ); - tmpx = newNormals.register[ 3 ].x * full_weights[ 0 ]; - tmpy = newNormals.register[ 3 ].y * full_weights[ 0 ]; - tmpz = newNormals.register[ 3 ].z * full_weights[ 0 ]; - newNormals.buffer[ ( oldFaces.register[ 0 ].a * 3 ) + 0 ] += newNormals.register[ 3 ].x * full_weights[ 0 ]; newNormals.buffer[ ( oldFaces.register[ 0 ].a * 3 ) + 1 ] += newNormals.register[ 3 ].y * full_weights[ 0 ]; newNormals.buffer[ ( oldFaces.register[ 0 ].a * 3 ) + 2 ] += newNormals.register[ 3 ].z * full_weights[ 0 ]; diff --git a/examples/js/renderers/RaytracingWorker.js b/examples/js/renderers/RaytracingWorker.js index dd90ec043c6a20d5b1e5ab425d88d80ca5de8041..d0818d5cf252eb92dbb715177902ec41509af593 100644 --- a/examples/js/renderers/RaytracingWorker.js +++ b/examples/js/renderers/RaytracingWorker.js @@ -80,12 +80,10 @@ self.onmessage = function( e ) { * @author zz95 / http://github.com/zz85 */ -THREE.RaytracingRendererWorker = function ( parameters ) { +THREE.RaytracingRendererWorker = function () { console.log( 'THREE.RaytracingRendererWorker', THREE.REVISION ); - parameters = parameters || {}; - var scope = this; var maxRecursionDepth = 3; diff --git a/examples/webgl_gpgpu_protoplanet.html b/examples/webgl_gpgpu_protoplanet.html index 903ce833041238875e3bc70a3e30b39036619fa5..b1a5857ff42e054b6c9bdea18e8851e6755b7149 100644 --- a/examples/webgl_gpgpu_protoplanet.html +++ b/examples/webgl_gpgpu_protoplanet.html @@ -312,8 +312,6 @@ } - var last = performance.now(); - var gpuCompute; var velocityVariable; var positionVariable; @@ -600,12 +598,6 @@ function render() { - var now = performance.now(); - var delta = (now - last) / 1000; - - if (delta > 1) delta = 1; // safety cap on large deltas - last = now; - gpuCompute.compute(); particleUniforms.texturePosition.value = gpuCompute.getCurrentRenderTarget( positionVariable ).texture; diff --git a/examples/webgl_materials_nodes.html b/examples/webgl_materials_nodes.html index 0f52273d8531d1f42f7445ec7f187ec71c261c48..fe36f8dde039658fa9d4b0ebd3f7cfa91ba54ef3 100644 --- a/examples/webgl_materials_nodes.html +++ b/examples/webgl_materials_nodes.html @@ -577,8 +577,6 @@ var colorA = new THREE.ColorNode( 0xFFFFFF ); var colorB = new THREE.ColorNode( 0x0054df ); - var uv = new THREE.UVNode(); - var timeScale = new THREE.OperatorNode( time, speed, @@ -1901,7 +1899,7 @@ var setMyVar = new THREE.FunctionNode( [ "float setMyVar( vec3 pos ) {", - // set "myVar" in vertex shader in this example, + // set "myVar" in vertex shader in this example, // can be used in fragment shader too or in rest of the current shader " myVar = pos;", // it is not accept "void" functions for now! diff --git a/examples/webgl_materials_skin.html b/examples/webgl_materials_skin.html index fdc5fdfec64eb0af04c8848639c7cca09fee631c..ab2eb72d4930e175bb16f10d7c4ab71ad890e707 100644 --- a/examples/webgl_materials_skin.html +++ b/examples/webgl_materials_skin.html @@ -109,9 +109,7 @@ // MATERIALS - var diffuse = 0xbbbbbb, specular = 0x070707, shininess = 50; - - specular = 0x555555; + var diffuse = 0xbbbbbb, specular = 0x555555, shininess = 50; var shader = THREE.ShaderSkin[ "skin" ]; diff --git a/examples/webgl_postprocessing_dof2.html b/examples/webgl_postprocessing_dof2.html index d2391f1ec5464f0667b0f0f8537cfb3b6269e4d2..1beb88b140533cdc90eca2da6b4e1ca7eb9ffbc1 100644 --- a/examples/webgl_postprocessing_dof2.html +++ b/examples/webgl_postprocessing_dof2.html @@ -496,7 +496,7 @@ Use WEBGL Depth buffer support? } for (var i=0;i