Skip to content

XLoader: Added setCrossOrigin(), setPath() and setResourcePath() #15041

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

Merged
merged 1 commit into from
Oct 12, 2018
Merged

XLoader: Added setCrossOrigin(), setPath() and setResourcePath() #15041

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
56 changes: 48 additions & 8 deletions examples/js/loaders/XLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@
this.manager = manager !== undefined ? manager : new THREE.DefaultLoadingManager();
this.texloader = new THREE.TextureLoader( this.manager );
this.url = "";
this.baseDir = "";
this._putMatLength = 0;
this._nowMat = null;
this._nowFrameName = "";
Expand All @@ -238,6 +237,9 @@
}

createClass( XLoader, [ {
key: 'crossOrigin',
value: 'anonymous'
}, {
key: '_setArgOption',
value: function _setArgOption( _arg ) {

Expand Down Expand Up @@ -277,13 +279,38 @@

this._setArgOption( _arg );
var loader = new THREE.FileLoader( this.manager );
loader.setPath( this.path );
loader.setResponseType( 'arraybuffer' );
loader.load( this.url, function ( response ) {

_this._parse( response, onLoad );

}, onProgress, onError );

}
}, {
key: 'setCrossOrigin',
value: function setCrossOrigin( value ) {

this.crossOrigin = value;
return this;

}
}, {
key: 'setPath',
value: function setPath( value ) {

this.path = value;
return this;

}
}, {
key: 'setResourcePath',
value: function setResourcePath( value ) {

this.resourcePath = value;
return this;

}
}, {
key: 'fromResponsedData',
Expand Down Expand Up @@ -470,11 +497,24 @@
key: '_parseASCII',
value: function _parseASCII() {

if ( this.url.lastIndexOf( "/" ) > 0 ) {
var path;

if ( this.resourcePath !== undefined ) {

path = this.resourcePath;

} else if ( this.path !== undefined ) {

this.baseDir = this.url.substr( 0, this.url.lastIndexOf( "/" ) + 1 );
path = this.path;

} else {

path = THREE.LoaderUtils.extractUrlBase( this.url );

}

this.texloader.setPath( path ).setCrossOrigin( this.crossOrigin );

var endRead = 16;
this.Hierarchies.children = [];
this._hierarchieParse( this.Hierarchies, endRead );
Expand Down Expand Up @@ -1180,21 +1220,21 @@
switch ( localObject.type ) {

case "TextureFilename":
_nowMat.map = this.texloader.load( this.baseDir + fileName );
_nowMat.map = this.texloader.load( fileName );
break;
case "BumpMapFilename":
_nowMat.bumpMap = this.texloader.load( this.baseDir + fileName );
_nowMat.bumpMap = this.texloader.load( fileName );
_nowMat.bumpScale = 0.05;
break;
case "NormalMapFilename":
_nowMat.normalMap = this.texloader.load( this.baseDir + fileName );
_nowMat.normalMap = this.texloader.load( fileName );
_nowMat.normalScale = new THREE.Vector2( 2, 2 );
break;
case "EmissiveMapFilename":
_nowMat.emissiveMap = this.texloader.load( this.baseDir + fileName );
_nowMat.emissiveMap = this.texloader.load( fileName );
break;
case "LightMapFilename":
_nowMat.lightMap = this.texloader.load( this.baseDir + fileName );
_nowMat.lightMap = this.texloader.load( fileName );
break;

}
Expand Down