浏览代码

Merge pull request #11770 from Mugen87/collada2

ColladaLoader2: Clean up
Mr.doob 8 年之前
父节点
当前提交
743a7ceda5
共有 1 个文件被更改,包括 5 次插入6 次删除
  1. 5 6
      examples/js/loaders/ColladaLoader2.js

+ 5 - 6
examples/js/loaders/ColladaLoader2.js

@@ -17,14 +17,12 @@ THREE.ColladaLoader.prototype = {
 
 		var scope = this;
 
-		var resourceDirectory = url.split( /[\\\/]/ );
-		resourceDirectory.pop();
-		resourceDirectory = resourceDirectory.join( '/' ) + '/';
+		var path = THREE.Loader.prototype.extractUrlBase( url );
 
 		var loader = new THREE.FileLoader( scope.manager );
 		loader.load( url, function ( text ) {
 
-			onLoad( scope.parse( text, resourceDirectory ) );
+			onLoad( scope.parse( text, path ) );
 
 		}, onProgress, onError );
 
@@ -46,7 +44,7 @@ THREE.ColladaLoader.prototype = {
 
 	},
 
-	parse: function ( text, resourceDirectory ) {
+	parse: function ( text, path ) {
 
 		function getElementsByTagName( xml, name ) {
 
@@ -3184,7 +3182,8 @@ THREE.ColladaLoader.prototype = {
 		console.log( 'THREE.ColladaLoader: File version', version );
 
 		var asset = parseAsset( getElementsByTagName( collada, 'asset' )[ 0 ] );
-		var textureLoader = new THREE.TextureLoader( this.manager ).setPath( resourceDirectory );
+		var textureLoader = new THREE.TextureLoader( this.manager );
+		textureLoader.setPath( path ).setCrossOrigin( this.crossOrigin );
 
 		//