|
@@ -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 = [];
|
|
|
|