Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 37 additions & 4 deletions examples/js/loaders/TDSLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ THREE.TDSLoader.prototype = {

constructor: THREE.TDSLoader,

crossOrigin: 'anonymous',

/**
* Load 3ds file from url.
*
Expand All @@ -44,7 +46,7 @@ THREE.TDSLoader.prototype = {
var path = this.path !== undefined ? this.path : THREE.LoaderUtils.extractUrlBase( url );

var loader = new THREE.FileLoader( this.manager );

loader.setPath( this.path );
loader.setResponseType( 'arraybuffer' );

loader.load( url, function ( data ) {
Expand Down Expand Up @@ -520,7 +522,7 @@ THREE.TDSLoader.prototype = {
var texture = {};

var loader = new THREE.TextureLoader( this.manager );
loader.setPath( path );
loader.setPath( this.resourcePath || path ).setCrossOrigin( this.crossOrigin );

while ( next !== 0 ) {

Expand Down Expand Up @@ -842,10 +844,10 @@ THREE.TDSLoader.prototype = {
},

/**
* Set resource path used to determine the file path to attached resources.
* Set path to adjust the path to the original 3ds file.
*
* @method setPath
* @param {String} path Path to resources.
* @param {String} path Path to file.
* @return Self for chaining.
*/
setPath: function ( path ) {
Expand All @@ -856,6 +858,37 @@ THREE.TDSLoader.prototype = {

},

/**
* Set resource path used to determine the path to attached resources like textures.
*
* @method setResourcePath
* @param {String} resourcePath Path to resources.
* @return Self for chaining.
*/
setResourcePath: function ( resourcePath ) {

this.resourcePath = resourcePath;

return this;

},

/**
* Set crossOrigin value to configure CORS settings
* for the image loading process.
*
* @method setCrossOrigin
* @param {String} crossOrigin crossOrigin string.
* @return Self for chaining.
*/
setCrossOrigin: function ( crossOrigin ) {

this.crossOrigin = crossOrigin;

return this;

},

/**
* Print debug message to the console.
*
Expand Down
2 changes: 1 addition & 1 deletion examples/webgl_loader_3ds.html
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
var normal = loader.load( 'models/3ds/portalgun/textures/normal.jpg' );

var loader = new THREE.TDSLoader( );
loader.setPath( 'models/3ds/portalgun/textures/' );
loader.setResourcePath( 'models/3ds/portalgun/textures/' );
loader.load( 'models/3ds/portalgun/portalgun.3ds', function ( object ) {

object.traverse( function ( child ) {
Expand Down