Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use FileLoader.setMimeType() from MMDLoader #9990

Merged
merged 1 commit into from
Nov 2, 2016
Merged

Use FileLoader.setMimeType() from MMDLoader #9990

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions examples/js/loaders/MMDLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand All @@ -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' );

};

Expand Down