|
@@ -251,10 +251,16 @@ THREE.ObjectLoader.prototype = {
|
|
var loader = new THREE.ImageLoader( manager );
|
|
var loader = new THREE.ImageLoader( manager );
|
|
loader.setCrossOrigin( this.crossOrigin );
|
|
loader.setCrossOrigin( this.crossOrigin );
|
|
|
|
|
|
|
|
+ if ( json.length === 0 ) {
|
|
|
|
+
|
|
|
|
+ manager.onLoad();
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
for ( var i = 0, l = json.length; i < l; i ++ ) {
|
|
for ( var i = 0, l = json.length; i < l; i ++ ) {
|
|
|
|
|
|
- var data = json[ i ],
|
|
|
|
- url = self.texturePath + data.url;
|
|
|
|
|
|
+ var data = json[ i ];
|
|
|
|
+ var url = self.texturePath + data.url;
|
|
|
|
|
|
self.manager.itemStart( url );
|
|
self.manager.itemStart( url );
|
|
loader.load( url, function ( image ) {
|
|
loader.load( url, function ( image ) {
|
|
@@ -267,6 +273,11 @@ THREE.ObjectLoader.prototype = {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
|
|
+
|
|
|
|
+ manager.onLoad();
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
return images;
|
|
return images;
|