Skip to content

Commit 383b44e

Browse files
authored
Merge pull request #14764 from Mugen87/dev2
Clean up
2 parents 1fe4e34 + 886e79f commit 383b44e

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

editor/js/Loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ var Loader = function ( editor ) {
490490

491491
if ( file.name.search( /\.glb$/i ) > - 1 ) {
492492

493-
var loader = new THREE.GLTFLoader( manager );
493+
var loader = new THREE.GLTFLoader();
494494
loader.parse( file.asArrayBuffer(), '', function ( result ) {
495495

496496
editor.execute( new AddObjectCommand( result.scene ) );

examples/js/loaders/MMDLoader.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ THREE.MMDLoader = ( function () {
7575
*/
7676
load: function ( url, onLoad, onProgress, onError ) {
7777

78-
var parser = this._getParser();
7978
var builder = this.meshBuilder.setCrossOrigin( this.crossOrigin );
8079

8180
var texturePath = THREE.LoaderUtils.extractUrlBase( url );
@@ -216,7 +215,6 @@ THREE.MMDLoader = ( function () {
216215
var vmds = [];
217216
var vmdNum = urls.length;
218217

219-
var scope = this;
220218
var parser = this._getParser();
221219

222220
this.loader
@@ -246,9 +244,7 @@ THREE.MMDLoader = ( function () {
246244
* @param {function} onProgress
247245
* @param {function} onError
248246
*/
249-
loadVPD: function ( url, isUnicode, onLoad, onProgress, onError, params ) {
250-
251-
params = params || {};
247+
loadVPD: function ( url, isUnicode, onLoad, onProgress, onError ) {
252248

253249
var parser = this._getParser();
254250

@@ -353,9 +349,9 @@ THREE.MMDLoader = ( function () {
353349

354350
var geometry = this.geometryBuilder.build( data );
355351
var material = this.materialBuilder
356-
.setCrossOrigin( this.crossOrigin )
357-
.setTexturePath( texturePath )
358-
.build( data, geometry, onProgress, onError );
352+
.setCrossOrigin( this.crossOrigin )
353+
.setTexturePath( texturePath )
354+
.build( data, geometry, onProgress, onError );
359355

360356
var mesh = new THREE.SkinnedMesh( geometry, material );
361357

@@ -1081,7 +1077,7 @@ THREE.MMDLoader = ( function () {
10811077

10821078
// parameters for OutlineEffect
10831079
params.userData.outlineParameters = {
1084-
thickness: material.edgeSize / 300, // TODO: better calculation?
1080+
thickness: material.edgeSize / 300, // TODO: better calculation?
10851081
color: material.edgeColor.slice( 0, 3 ),
10861082
alpha: material.edgeColor[ 3 ],
10871083
visible: ( material.flag & 0x10 ) !== 0 && material.edgeSize > 0.0
@@ -1439,7 +1435,7 @@ THREE.MMDLoader = ( function () {
14391435
array.push( interpolation[ index + 4 ] / 127 ); // y1
14401436
array.push( interpolation[ index + 12 ] / 127 ); // y2
14411437

1442-
};
1438+
}
14431439

14441440
var tracks = [];
14451441

@@ -1593,7 +1589,7 @@ THREE.MMDLoader = ( function () {
15931589
array.push( interpolation[ index * 4 + 2 ] / 127 ); // y1
15941590
array.push( interpolation[ index * 4 + 3 ] / 127 ); // y2
15951591

1596-
};
1592+
}
15971593

15981594
var tracks = [];
15991595

examples/js/math/Lut.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,6 @@ THREE.Lut.prototype = {
390390

391391
contextTick.font = 'Normal ' + this.legend.labels.fontsize + 'px ' + this.legend.labels.fontface;
392392

393-
var metrics = contextTick.measureText( value.toString() );
394-
395393
contextTick.fillStyle = 'rgba(' + backgroundColor.r + ',' + backgroundColor.g + ',' + backgroundColor.b + ',' + backgroundColor.a + ')';
396394

397395
contextTick.strokeStyle = 'rgba(' + borderColor.r + ',' + borderColor.g + ',' + borderColor.b + ',' + borderColor.a + ')';

0 commit comments

Comments
 (0)