Skip to content

Commit

Permalink
Fix DemoLoader script, room entities were never enabled when assets h…
Browse files Browse the repository at this point in the history
…ad been already loaded
  • Loading branch information
kungfooman committed Jun 21, 2023
1 parent c36bdd8 commit 25e565c
Showing 1 changed file with 9 additions and 23 deletions.
32 changes: 9 additions & 23 deletions files/demo-loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,33 +44,19 @@ DemoLoader.prototype.initialize = function() {
}.bind(this));
};

/**
* @param {string} room
* @param {Function} done
*/
DemoLoader.prototype.loadRoom = function (room, done) {
var app = this.app;
var assetRegistry = app.assets;
var assets = assetRegistry.findByTag(room.toLowerCase());
assets = assets.filter(function (asset) {
return !asset.loaded;
});
if (assets.length === 0) {
done();
}
var count = 0;

var _onLoad = function (asset) {
count++;

if (count === assets.length) {
app.root.findByName(room).enabled = true;
if (done) {
done();
}
}
};

assets.forEach(function (asset) {
asset.once("load", _onLoad);
assetRegistry.load(asset);
});
var assetListLoader = new pc.AssetListLoader(assets, assetRegistry);
assetListLoader.load(() => {
app.root.findByName(room).enabled = true;
done?.();
})
};

DemoLoader.prototype.fixupMaterials = function () {
Expand Down

0 comments on commit 25e565c

Please sign in to comment.