From 886e79fc40edd210044a5d3c7cd9f3ef7d763422 Mon Sep 17 00:00:00 2001 From: Mugen87 Date: Wed, 22 Aug 2018 18:47:41 +0200 Subject: [PATCH] Clean up --- editor/js/Loader.js | 2 +- examples/js/loaders/MMDLoader.js | 18 +++++++----------- examples/js/math/Lut.js | 2 -- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/editor/js/Loader.js b/editor/js/Loader.js index 7929eb2bb6..eb5891cf43 100644 --- a/editor/js/Loader.js +++ b/editor/js/Loader.js @@ -490,7 +490,7 @@ var Loader = function ( editor ) { if ( file.name.search( /\.glb$/i ) > - 1 ) { - var loader = new THREE.GLTFLoader( manager ); + var loader = new THREE.GLTFLoader(); loader.parse( file.asArrayBuffer(), '', function ( result ) { editor.execute( new AddObjectCommand( result.scene ) ); diff --git a/examples/js/loaders/MMDLoader.js b/examples/js/loaders/MMDLoader.js index 310602f8bf..f48c21ed97 100644 --- a/examples/js/loaders/MMDLoader.js +++ b/examples/js/loaders/MMDLoader.js @@ -75,7 +75,6 @@ THREE.MMDLoader = ( function () { */ load: function ( url, onLoad, onProgress, onError ) { - var parser = this._getParser(); var builder = this.meshBuilder.setCrossOrigin( this.crossOrigin ); var texturePath = THREE.LoaderUtils.extractUrlBase( url ); @@ -216,7 +215,6 @@ THREE.MMDLoader = ( function () { var vmds = []; var vmdNum = urls.length; - var scope = this; var parser = this._getParser(); this.loader @@ -246,9 +244,7 @@ THREE.MMDLoader = ( function () { * @param {function} onProgress * @param {function} onError */ - loadVPD: function ( url, isUnicode, onLoad, onProgress, onError, params ) { - - params = params || {}; + loadVPD: function ( url, isUnicode, onLoad, onProgress, onError ) { var parser = this._getParser(); @@ -353,9 +349,9 @@ THREE.MMDLoader = ( function () { var geometry = this.geometryBuilder.build( data ); var material = this.materialBuilder - .setCrossOrigin( this.crossOrigin ) - .setTexturePath( texturePath ) - .build( data, geometry, onProgress, onError ); + .setCrossOrigin( this.crossOrigin ) + .setTexturePath( texturePath ) + .build( data, geometry, onProgress, onError ); var mesh = new THREE.SkinnedMesh( geometry, material ); @@ -1081,7 +1077,7 @@ THREE.MMDLoader = ( function () { // parameters for OutlineEffect params.userData.outlineParameters = { - thickness: material.edgeSize / 300, // TODO: better calculation? + thickness: material.edgeSize / 300, // TODO: better calculation? color: material.edgeColor.slice( 0, 3 ), alpha: material.edgeColor[ 3 ], visible: ( material.flag & 0x10 ) !== 0 && material.edgeSize > 0.0 @@ -1439,7 +1435,7 @@ THREE.MMDLoader = ( function () { array.push( interpolation[ index + 4 ] / 127 ); // y1 array.push( interpolation[ index + 12 ] / 127 ); // y2 - }; + } var tracks = []; @@ -1593,7 +1589,7 @@ THREE.MMDLoader = ( function () { array.push( interpolation[ index * 4 + 2 ] / 127 ); // y1 array.push( interpolation[ index * 4 + 3 ] / 127 ); // y2 - }; + } var tracks = []; diff --git a/examples/js/math/Lut.js b/examples/js/math/Lut.js index f18a88dc99..261e3f6aaf 100644 --- a/examples/js/math/Lut.js +++ b/examples/js/math/Lut.js @@ -390,8 +390,6 @@ THREE.Lut.prototype = { contextTick.font = 'Normal ' + this.legend.labels.fontsize + 'px ' + this.legend.labels.fontface; - var metrics = contextTick.measureText( value.toString() ); - contextTick.fillStyle = 'rgba(' + backgroundColor.r + ',' + backgroundColor.g + ',' + backgroundColor.b + ',' + backgroundColor.a + ')'; contextTick.strokeStyle = 'rgba(' + borderColor.r + ',' + borderColor.g + ',' + borderColor.b + ',' + borderColor.a + ')'; -- GitLab