From 7d47d176981d3545b6dcff1afc5463af449ffb2f Mon Sep 17 00:00:00 2001 From: Takahiro Date: Wed, 2 Nov 2016 02:52:43 -0700 Subject: [PATCH] Use FileLoader.setMimeType() from MMDLoader --- examples/js/loaders/MMDLoader.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/examples/js/loaders/MMDLoader.js b/examples/js/loaders/MMDLoader.js index a5900618f93d08..2c0b0159d69fe5 100644 --- a/examples/js/loaders/MMDLoader.js +++ b/examples/js/loaders/MMDLoader.js @@ -308,10 +308,12 @@ THREE.MMDLoader.prototype.extractExtension = function ( url ) { }; -THREE.MMDLoader.prototype.loadFile = function ( url, onLoad, onProgress, onError, responseType ) { +THREE.MMDLoader.prototype.loadFile = function ( url, onLoad, onProgress, onError, responseType, mimeType ) { var loader = new THREE.FileLoader( this.manager ); + if ( mimeType !== undefined ) loader.setMimeType( mimeType ); + loader.setResponseType( responseType ); var request = loader.load( url, function ( result ) { @@ -338,15 +340,7 @@ THREE.MMDLoader.prototype.loadFileAsText = function ( url, onLoad, onProgress, o THREE.MMDLoader.prototype.loadFileAsShiftJISText = function ( url, onLoad, onProgress, onError ) { - var request = this.loadFile( url, onLoad, onProgress, onError, 'text' ); - - /* - * TODO: some browsers seem not support overrideMimeType - * so some workarounds for them may be necessary. - * Note: to set property of request after calling request.send(null) - * (it's called in THREE.FileLoader.load()) could be a bad manner. - */ - request.overrideMimeType( 'text/plain; charset=shift_jis' ); + var request = this.loadFile( url, onLoad, onProgress, onError, 'text', 'text/plain; charset=shift_jis' ); };