wgge 2.0.6 → 2.0.8

package/core/Collection.js

@@ -63,8 +63,9 @@ export default class Collection extends NodeWithEvents {
 		return this.count() <= 0;
 	}
 
-	count() {
-		return this.items.length;
+	count(filter = null) {
+		if (!filter) return this.items.length;
+		return this.items.reduce((prev, current) => filter(current) ? prev + 1 : prev, 0);
 	}
 
 	contains(item) {

package/game/GameRenderer.js

@@ -36,7 +36,7 @@ export default class GameRenderer extends DomRenderer {
 		this.addAutoEventMultiple(
 			[
 				this.model.assets.totalLoaders,
-				this.model.assets.blockingLoaders,
+				this.model.assets.preloadingLoaders,
 				this.model.assets.sessionTotalLoaders,
 				this.model.assets.sessionFinishedLoaders
 			],
@@ -75,7 +75,7 @@ export default class GameRenderer extends DomRenderer {
 	}
 
 	updateLoading() {
-		const isLoading = this.model.assets.blockingLoaders.get() > 0;
+		const isLoading = this.model.assets.totalLoaders.get() > 0;
 		if (this.loading && !isLoading) {
 			this.removeElement(this.loading);
 			this.loading = null;

package/game/assets/AssetCache.js

@@ -36,7 +36,7 @@ export default class AssetCache extends ObjectModel {
 	/**
 	 * @type IntValue
 	 */
-	blockingLoaders;
+	preloadingLoaders;
 
 	/**
 	 * @type IntValue
@@ -62,7 +62,7 @@ export default class AssetCache extends ObjectModel {
 		this.loaders = new Collection();
 
 		this.totalLoaders = this.addProperty('totalLoaders', new IntValue(0));
-		this.blockingLoaders = this.addProperty('blockingLoaders', new IntValue(0));
+		this.preloadingLoaders = this.addProperty('preloadingLoaders', new IntValue(0));
 		this.sessionTotalLoaders = this.addProperty('sessionTotalLoaders', new IntValue(0));
 		this.sessionFinishedLoaders = this.addProperty('sessionFinishedLoaders', new IntValue(0));
 
@@ -75,34 +75,28 @@ export default class AssetCache extends ObjectModel {
 		this.loaderClasses.set(id, cls);
 	}
 
+	updateLoadingState() {
+		this.totalLoaders.set(this.loaders.count());
+		this.preloadingLoaders.set(this.loaders.count((l) => l.isPreloading));
+	}
+
 	loaderAdded(loader) {
-		this.updateLoadingState();
-		if (!loader.isPreloading) {
-			this.sessionTotalLoaders.increase();
+		if (this.totalLoaders.equalsTo(0)) {
+			this.sessionFinishedLoaders.set(0);
+			this.sessionTotalLoaders.set(0);
 		}
-
+		this.updateLoadingState();
+		this.sessionTotalLoaders.increase();
 	}
 
 	loaderRemoved(loader) {
 		this.updateLoadingState();
-		if (!loader.isPreloading) {
-			this.sessionFinishedLoaders.increase();
-			if (this.blockingLoaders.equalsTo(0)) {
-				this.sessionFinishedLoaders.set(0);
-				this.sessionTotalLoaders.set(0);
-			}
-		}
-	}
-
-	updateLoadingState() {
-		this.totalLoaders.set(this.loaders.count());
-		const blocking = this.loaders.filter((l) => l.isPreloading === false).length;
-		this.blockingLoaders.set(blocking);
+		this.sessionFinishedLoaders.increase();
 	}
 
-	resetCache(name = null) {
-		if (name) {
-			this.cache.remove(name);
+	resetCache(uri = null) {
+		if (uri) {
+			this.cache.remove(uri);
 		} else {
 			this.cache.reset();
 		}
@@ -114,14 +108,14 @@ export default class AssetCache extends ObjectModel {
 		this.loaders.remove(loader);
 	}
 
-	loaderSucceeded(loader, resource, onLoaded) {
+	loaderSucceeded(loader, asset, onLoaded) {
 		if (this.cache.exists(loader.uri)) {
-			this.cache.set(loader.uri, resource);
-			console.warn(`Resource ${loader.uri} was already present then loaded and replaced.`);
+			this.cache.set(loader.uri, asset);
+			console.warn(`Asset ${loader.uri} was already present then loaded and replaced.`);
 		} else {
-			this.cache.add(loader.uri, resource);
+			this.cache.add(loader.uri, asset);
 		}
-		if (onLoaded) onLoaded(resource);
+		if (onLoaded) onLoaded(asset);
 		this.loaders.remove(loader);
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wgge",
-	"version": "2.0.6",
+	"version": "2.0.8",
 	"description": "Web GL Game Engine",
 	"main": "index.js",
 	"devDependencies": {