浏览代码

Merge pull request #6106 from rkusa/dataurl

ObjectLoader: support data urls
Mr.doob 10 年之前
父节点
当前提交
a0351d6631
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      src/loaders/ObjectLoader.js

+ 2 - 1
src/loaders/ObjectLoader.js

@@ -322,8 +322,9 @@ THREE.ObjectLoader.prototype = {
 			for ( var i = 0, l = json.length; i < l; i ++ ) {
 
 				var image = json[ i ];
+				var path = /^(\/\/)|([a-z]+:(\/\/)?)/i.test( image.url ) ? image.url : scope.texturePath + image.url;
 
-				images[ image.uuid ] = loadImage( scope.texturePath + image.url );
+				images[ image.uuid ] = loadImage( path );
 
 			}