wgge 2.0.5 → 2.0.7

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/core/model/value/IntValue.js

@@ -22,7 +22,7 @@ export default class IntValue extends DirtyValue {
 		return super.isEmpty() || Number.isNaN(this.value);
 	}
 
-	increase(num) {
+	increase(num = 1) {
 		this.set(this.get() + num);
 	}
 

package/game/GameModel.js

@@ -5,6 +5,7 @@ import BoolValue from "../core/model/value/BoolValue";
 import GlobalAudioModel from "../core/audio/global/GlobalAudioModel";
 import AssetCache from "./assets/AssetCache";
 import NullableNode from "../core/model/value/NullableNode";
+import ResourcesModel from "./resources/ResourcesModel";
 
 export default class GameModel extends ObjectModel {
 
@@ -23,6 +24,16 @@ export default class GameModel extends ObjectModel {
 	 */
 	viewBoxSize;
 
+	/**
+	 * @type NullableNode<SaveGameModel>
+	 */
+	saveGame;
+
+	/**
+	 * @type ResourcesModel
+	 */
+	resources;
+
 	/**
 	 * @type AssetCache
 	 */
@@ -44,7 +55,9 @@ export default class GameModel extends ObjectModel {
 		this.isInDebugMode = this.addProperty('isInDebugMode', new BoolValue(debugModeEnabled));
 		this.menu = this.addProperty('menu', new NullableNode());
 		this.viewBoxSize = this.addProperty('viewBoxSize', new Vector2());
-		this.assets = new AssetCache(this.resources);
+		this.saveGame = this.addProperty('saveGame', new NullableNode());
+		this.resources = this.addProperty('resources', new ResourcesModel());
+		this.assets = this.addProperty('assets', new AssetCache(this.resources));
 		this.audio = this.addProperty('audio', new GlobalAudioModel());
 		this.controls = this.addProperty('controls', new ControlsModel());
 	}

package/game/GameRenderer.js

@@ -33,9 +33,14 @@ export default class GameRenderer extends DomRenderer {
 			)
 		);
 
-		this.addAutoEvents(
-			this.model.assets,
-			['session-finished-loaders-changed', 'session-total-loaders-changed'],
+		this.addAutoEventMultiple(
+			[
+				this.model.assets.totalLoaders,
+				this.model.assets.blockingLoaders,
+				this.model.assets.sessionTotalLoaders,
+				this.model.assets.sessionFinishedLoaders
+			],
+			'changed',
 			() => this.updateLoading(),
 			true
 		);
@@ -70,7 +75,7 @@ export default class GameRenderer extends DomRenderer {
 	}
 
 	updateLoading() {
-		const isLoading = this.model.assets.blockingLoaders > 0;
+		const isLoading = this.model.assets.totalLoaders.get() > 0;
 		if (this.loading && !isLoading) {
 			this.removeElement(this.loading);
 			this.loading = null;
@@ -86,9 +91,9 @@ export default class GameRenderer extends DomRenderer {
 				const progressWrapper = DOMHelper.createElement(content, 'div', 'progress-wrapper mt-2');
 				this.loadingProgress = DOMHelper.createElement(progressWrapper, 'div', 'stretch');
 			}
-			const portion = this.game.assets.sessionFinishedLoaders / this.game.assets.sessionTotalLoaders;
+			const portion = this.game.assets.sessionFinishedLoaders.get() / this.game.assets.sessionTotalLoaders.get();
 			this.loadingProgress.style.width = `${Math.round(portion * 100)}%`;
-			this.label2.innerText = `${this.game.assets.sessionFinishedLoaders}/${this.game.assets.sessionTotalLoaders}`;
+			this.label2.innerText = `${this.game.assets.sessionFinishedLoaders.get()}/${this.game.assets.sessionTotalLoaders.get()}`;
 		}
 	}
 

package/game/assets/AssetCache.js

@@ -4,16 +4,14 @@ import ImageLoader from "./loader/ImageLoader";
 import AudioLoader from "./loader/AudioLoader";
 import NodeWithEvents from "../../core/model/event/NodeWithEvents";
 import StringHelper from "../../core/helper/StringHelper";
-
-const ASSET_TYPE_LOADERS = {
-	'aud': AudioLoader,
-	'img': ImageLoader
-}
+import ObjectModel from "../../core/model/ObjectModel";
+import ResourcesModel from "../resources/ResourcesModel";
+import IntValue from "../../core/model/value/IntValue";
 
 /**
  * Keeps cached raw resources like images, sounds and 3D models
  */
-export default class AssetCache extends NodeWithEvents {
+export default class AssetCache extends ObjectModel {
 
 	/**
 	 * @type ResourcesModel
@@ -31,72 +29,74 @@ export default class AssetCache extends NodeWithEvents {
 	loaders;
 
 	/**
-	 * @type int
+	 * @type IntValue
 	 */
-	totalLoaders = 0;
+	totalLoaders;
 
 	/**
-	 * @type int
+	 * @type IntValue
 	 */
-	blockingLoaders = 0;
+	preloadingLoaders;
 
 	/**
-	 * @type int
+	 * @type IntValue
 	 */
-	sessionTotalLoaders = 0;
+	sessionTotalLoaders;
 
 	/**
-	 * @type int
+	 * @type IntValue
 	 */
-	sessionFinishedLoaders = 0;
+	sessionFinishedLoaders;
 
 	constructor(resources) {
-		super();
+		super(false);
+
+		this.loaderClasses = new Dictionary(
+			{
+				'aud': AudioLoader,
+				'img': ImageLoader
+			}
+		);
 		this.resources = resources;
 		this.cache = new Dictionary();
 		this.loaders = new Collection();
+
+		this.totalLoaders = this.addProperty('totalLoaders', 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));
+
 		this.loaders.addOnAddListener((loader) => this.loaderAdded(loader));
 		this.loaders.addOnRemoveListener((loader) => this.loaderRemoved(loader));
 
 	}
 
-	loaderAdded(loader) {
-		this.updateLoadingState();
-		if (!loader.isPreloading) {
-			this.sessionTotalLoaders++;
-			this.triggerEvent('session-total-loaders-changed', this.sessionTotalLoaders);
-		}
+	registerLoaderClass(id, cls) {
+		this.loaderClasses.set(id, cls);
+	}
 
+	updateLoadingState() {
+		this.totalLoaders.set(this.loaders.count());
+		this.preloadingLoaders.set(this.loaders.count((l) => l.isPreloading));
 	}
 
-	loaderRemoved(loader) {
-		this.updateLoadingState();
-		if (!loader.isPreloading) {
-			this.sessionFinishedLoaders++;
-			if (this.blockingLoaders === 0) {
-				this.sessionFinishedLoaders = 0;
-				this.sessionTotalLoaders = 0;
-			}
-			this.triggerEvent('session-finished-loaders-changed', this.sessionFinishedLoaders);
+	loaderAdded(loader) {
+		if (this.totalLoaders.equalsTo(0)) {
+			this.sessionFinishedLoaders.set(0);
+			this.sessionTotalLoaders.set(0);
 		}
+		this.updateLoadingState();
+		this.sessionTotalLoaders.increase();
 	}
 
-	updateLoadingState() {
-		const total = this.loaders.count();
-		if (this.totalLoaders !== total) {
-			this.totalLoaders = total;
-			this.triggerEvent('total-loaders-changed', total);
-		}
-		const blocking = this.loaders.filter((l) => l.isPreloading === false).length;
-		if (this.blockingLoaders !== blocking) {
-			this.blockingLoaders = blocking;
-			this.triggerEvent('blocking-loaders-changed', blocking);
-		}
+	loaderRemoved(loader) {
+		this.updateLoadingState();
+		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();
 		}
@@ -108,14 +108,14 @@ export default class AssetCache extends NodeWithEvents {
 		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);
 	}
 
@@ -139,12 +139,11 @@ export default class AssetCache extends NodeWithEvents {
 			}
 
 			const assetType = StringHelper.extractId(uri, 0);
-			if (ASSET_TYPE_LOADERS[assetType] === undefined) {
+			const loaderClass = this.loaderClasses.get(assetType);
+			if (!loaderClass) {
 				console.error(`Valid resource type could not be inferred from URI '${uri}'!`);
 			}
-
-			const loaderType = ASSET_TYPE_LOADERS[assetType];
-			const loader = new loaderType(this, uri, onLoaded === null);
+			const loader = new loaderClass(this, uri, onLoaded === null);
 			this.loaders.add(loader);
 			loader.load(
 				(resource) => this.loaderSucceeded(loader, resource, onLoaded),

package/game/resources/ResourcesModel.js

@@ -0,0 +1,20 @@
+import ObjectModel from "../../core/model/ObjectModel";
+import ModelNodeTable from "../../core/model/collection/table/ModelNodeTable";
+import ImageModel from "./image/ImageModel";
+
+export default class ResourcesModel extends ObjectModel {
+
+	/**
+	 * @type ModelNodeTable
+	 */
+	images;
+
+	constructor() {
+		super();
+
+		this.images = this.addProperty('images', new ModelNodeTable((id) => new ImageModel(id)));
+		//this.sounds = this.addProperty('sounds', new ModelNodeTable((id) => new Model3dModel(id)));
+
+	}
+
+}

package/game/resources/image/ImageModel.js

@@ -1,24 +1,19 @@
 import ObjectModel from "../../../core/model/ObjectModel";
 import StringValue from "../../../core/model/value/StringValue";
 import Vector2 from "../../../core/model/vector/Vector2";
+import IdentifiedModelNode from "../../../core/model/collection/table/IdentifiedModelNode";
 
-export default class ImageModel extends ObjectModel {
+export default class ImageModel extends IdentifiedModelNode {
 
 	/**
 	 * @type StringValue
 	 */
 	uri;
 
-	/**
-	 * @type Vector2
-	 */
-	size;
-
 	constructor(persistent = true) {
 		super(persistent);
 
 		this.uri = this.addProperty('uri', new StringValue());
-		this.size = this.addProperty('size', new Vector2(0, 0, false));
 	}
 
 }

package/package.json

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