提交 886e79fc 编写于 作者: M Mugen87

Clean up

上级 1fe4e34b
...@@ -490,7 +490,7 @@ var Loader = function ( editor ) { ...@@ -490,7 +490,7 @@ var Loader = function ( editor ) {
if ( file.name.search( /\.glb$/i ) > - 1 ) { if ( file.name.search( /\.glb$/i ) > - 1 ) {
var loader = new THREE.GLTFLoader( manager ); var loader = new THREE.GLTFLoader();
loader.parse( file.asArrayBuffer(), '', function ( result ) { loader.parse( file.asArrayBuffer(), '', function ( result ) {
editor.execute( new AddObjectCommand( result.scene ) ); editor.execute( new AddObjectCommand( result.scene ) );
......
...@@ -75,7 +75,6 @@ THREE.MMDLoader = ( function () { ...@@ -75,7 +75,6 @@ THREE.MMDLoader = ( function () {
*/ */
load: function ( url, onLoad, onProgress, onError ) { load: function ( url, onLoad, onProgress, onError ) {
var parser = this._getParser();
var builder = this.meshBuilder.setCrossOrigin( this.crossOrigin ); var builder = this.meshBuilder.setCrossOrigin( this.crossOrigin );
var texturePath = THREE.LoaderUtils.extractUrlBase( url ); var texturePath = THREE.LoaderUtils.extractUrlBase( url );
...@@ -216,7 +215,6 @@ THREE.MMDLoader = ( function () { ...@@ -216,7 +215,6 @@ THREE.MMDLoader = ( function () {
var vmds = []; var vmds = [];
var vmdNum = urls.length; var vmdNum = urls.length;
var scope = this;
var parser = this._getParser(); var parser = this._getParser();
this.loader this.loader
...@@ -246,9 +244,7 @@ THREE.MMDLoader = ( function () { ...@@ -246,9 +244,7 @@ THREE.MMDLoader = ( function () {
* @param {function} onProgress * @param {function} onProgress
* @param {function} onError * @param {function} onError
*/ */
loadVPD: function ( url, isUnicode, onLoad, onProgress, onError, params ) { loadVPD: function ( url, isUnicode, onLoad, onProgress, onError ) {
params = params || {};
var parser = this._getParser(); var parser = this._getParser();
...@@ -353,9 +349,9 @@ THREE.MMDLoader = ( function () { ...@@ -353,9 +349,9 @@ THREE.MMDLoader = ( function () {
var geometry = this.geometryBuilder.build( data ); var geometry = this.geometryBuilder.build( data );
var material = this.materialBuilder var material = this.materialBuilder
.setCrossOrigin( this.crossOrigin ) .setCrossOrigin( this.crossOrigin )
.setTexturePath( texturePath ) .setTexturePath( texturePath )
.build( data, geometry, onProgress, onError ); .build( data, geometry, onProgress, onError );
var mesh = new THREE.SkinnedMesh( geometry, material ); var mesh = new THREE.SkinnedMesh( geometry, material );
...@@ -1081,7 +1077,7 @@ THREE.MMDLoader = ( function () { ...@@ -1081,7 +1077,7 @@ THREE.MMDLoader = ( function () {
// parameters for OutlineEffect // parameters for OutlineEffect
params.userData.outlineParameters = { params.userData.outlineParameters = {
thickness: material.edgeSize / 300, // TODO: better calculation? thickness: material.edgeSize / 300, // TODO: better calculation?
color: material.edgeColor.slice( 0, 3 ), color: material.edgeColor.slice( 0, 3 ),
alpha: material.edgeColor[ 3 ], alpha: material.edgeColor[ 3 ],
visible: ( material.flag & 0x10 ) !== 0 && material.edgeSize > 0.0 visible: ( material.flag & 0x10 ) !== 0 && material.edgeSize > 0.0
...@@ -1439,7 +1435,7 @@ THREE.MMDLoader = ( function () { ...@@ -1439,7 +1435,7 @@ THREE.MMDLoader = ( function () {
array.push( interpolation[ index + 4 ] / 127 ); // y1 array.push( interpolation[ index + 4 ] / 127 ); // y1
array.push( interpolation[ index + 12 ] / 127 ); // y2 array.push( interpolation[ index + 12 ] / 127 ); // y2
}; }
var tracks = []; var tracks = [];
...@@ -1593,7 +1589,7 @@ THREE.MMDLoader = ( function () { ...@@ -1593,7 +1589,7 @@ THREE.MMDLoader = ( function () {
array.push( interpolation[ index * 4 + 2 ] / 127 ); // y1 array.push( interpolation[ index * 4 + 2 ] / 127 ); // y1
array.push( interpolation[ index * 4 + 3 ] / 127 ); // y2 array.push( interpolation[ index * 4 + 3 ] / 127 ); // y2
}; }
var tracks = []; var tracks = [];
......
...@@ -390,8 +390,6 @@ THREE.Lut.prototype = { ...@@ -390,8 +390,6 @@ THREE.Lut.prototype = {
contextTick.font = 'Normal ' + this.legend.labels.fontsize + 'px ' + this.legend.labels.fontface; 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.fillStyle = 'rgba(' + backgroundColor.r + ',' + backgroundColor.g + ',' + backgroundColor.b + ',' + backgroundColor.a + ')';
contextTick.strokeStyle = 'rgba(' + borderColor.r + ',' + borderColor.g + ',' + borderColor.b + ',' + borderColor.a + ')'; contextTick.strokeStyle = 'rgba(' + borderColor.r + ',' + borderColor.g + ',' + borderColor.b + ',' + borderColor.a + ')';
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册