瀏覽代碼

Merge pull request #20736 from Mugen87/dev

ObjectLoader: Ensure onLoad() is fired for DataTextures.
Mr.doob 4 年之前
父節點
當前提交
c37b1e7c2b
共有 1 個文件被更改,包括 17 次插入2 次删除
  1. 17 2
      src/loaders/ObjectLoader.js

+ 17 - 2
src/loaders/ObjectLoader.js

@@ -138,9 +138,24 @@ class ObjectLoader extends Loader {
 
 		}
 
-		if ( json.images === undefined || json.images.length === 0 ) {
+		//
 
-			if ( onLoad !== undefined ) onLoad( object );
+		if ( onLoad !== undefined ) {
+
+			let hasImages = false;
+
+			for ( const uuid in images ) {
+
+				if ( images[ uuid ] instanceof HTMLImageElement ) {
+
+					hasImages = true;
+					break;
+
+				}
+
+			}
+
+			if ( hasImages === false ) onLoad( object );
 
 		}