wgge 2.0.38 → 2.0.40

package/core/Dictionary.js

@@ -7,61 +7,54 @@ import ChangeEvent from "./model/event/ChangeEvent";
 export default class Dictionary extends NodeWithEvents {
 
 	/**
-	 * @type object
+	 * @type Map
 	 */
-	keyValues;
-
-	constructor(init = {}) {
-		super();
-		this.keyValues = init;
-	}
+	map= new Map();
 
 	get(key) {
-		return this.keyValues[key];
+		return this.map.get(key);
 	}
 
 	exists(key) {
-		return (this.keyValues[key] !== undefined);
+		return this.map.has(key);
 	}
 
-	add(key, value = null) {
-		return this.set(key, value);
+	remove(key) {
+		if (!this.exists(key)) return;
+		const element = this.get(key);
+		this.map.delete(key);
+		this.triggerEvent('remove', new ChangeEvent(undefined, element, key));
+		return element;
 	}
 
-	set(key, value = null) {
+	set(key, value = undefined) {
 		const old = this.get(key);
 		const existed = old !== undefined;
-		this.keyValues[key] = value;
 
 		if (existed) {
+			if (value === undefined) {
+				return this.remove(key);
+			}
+			this.map.set(key, value);
 			this.triggerEvent('set', new ChangeEvent(value, old, key));
 		} else {
+			this.map.set(key, value);
 			this.triggerEvent('add', new ChangeEvent(value, undefined, key));
 		}
+
 		return value;
 	}
 
-	remove(key) {
-		if (!this.exists(key)) return;
-
-		const element = this.get(key);
-		delete this.keyValues[key];
-		this.triggerEvent('remove', new ChangeEvent(undefined, element, key));
-		return element;
+	add(key, value = undefined) {
+		return this.set(key, value);
 	}
 
 	rename(key, newKey) {
 		this.add(newKey, this.remove(key));
 	}
 
-	reset() {
-		const keys = this.keys();
-		keys.forEach((key) => this.remove(key));
-		this.keyValues = {};
-	}
-
 	count() {
-		return this.keys().length;
+		return this.map.size;
 	}
 
 	isEmpty() {
@@ -69,13 +62,19 @@ export default class Dictionary extends NodeWithEvents {
 	}
 
 	keys() {
-		return Object.keys(this.keyValues);
+		return Array.from(this.map.keys());
 	}
 
-	forEach(func) {
-		for (let key in this.keyValues) {
-			func(key, this.keyValues[key]);
+	reset() {
+		const keys = this.keys();
+		for (let i = 0, max = keys.length; i < max; i++) {
+			this.remove(keys[i]);
 		}
+		this.map = new Map();
+	}
+
+	forEach(func) {
+		this.map.forEach((value, key) => func(key, value));
 	}
 
 }

package/core/model/event/NodeWithEvents.js

@@ -28,10 +28,5 @@ export default class NodeWithEvents {
 			this.eventManager.triggerEvent(eventName, param);
 		}
 	}
-/*
-	static isNodeWithEvents(node) {
-		if (!node) return false;
-		return (typeof node === 'object' && typeof node.addEventListener === 'function');
-	}
-*/
+
 }

package/game/assets/AssetCache.js

@@ -21,12 +21,17 @@ export default class AssetCache extends ObjectModel {
 	/**
 	 * @type Dictionary
 	 */
-	cache;
+	cache = new Dictionary();
+
+	/**
+	 * @type Dictionary
+	 */
+	loaderClasses = new Dictionary();
 
 	/**
 	 * @type Collection
 	 */
-	loaders;
+	loaders = new Collection();
 
 	/**
 	 * @type IntValue
@@ -51,15 +56,7 @@ export default class AssetCache extends ObjectModel {
 	constructor(resources) {
 		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));
@@ -79,6 +76,9 @@ export default class AssetCache extends ObjectModel {
 			}
 		);
 
+		this.registerLoaderClass('aud', AudioLoader);
+		this.registerLoaderClass('img', ImageLoader);
+
 	}
 
 	registerLoaderClass(id, cls) {
@@ -100,8 +100,8 @@ export default class AssetCache extends ObjectModel {
 		this.sessionFinishedLoaders.increase();
 	}
 
-	resetCache(uri = null) {
-		if (uri) {
+	resetCache(uri = undefined) {
+		if (uri !== undefined) {
 			this.cache.remove(uri);
 		} else {
 			this.cache.reset();
@@ -158,25 +158,22 @@ export default class AssetCache extends ObjectModel {
 		}
 	}
 
-	loadImage(url, onLoaded) {
-		this.loadAsset(url, onLoaded);
+	loadImage(path, onLoaded) {
+		this.loadAsset(`img/${path}`, onLoaded);
 	}
 
-	loadAudio(materialId, onLoaded) {
-		this.loadAsset(`mat/${materialId}`, onLoaded);
+	loadAudio(path, onLoaded) {
+		this.loadAsset(`aud/${path}`, onLoaded);
 	}
 
-	resetMaterial(materialId) {
-		this.resetCache(`mat/${materialId}`);
+	preload(uris) {
+		console.log('Preloading:', uris);
+		uris.forEach((uri) => this.loadAsset(uri));
 	}
 
-	preload(resources) {
-		console.log('Preloading:', resources);
-		resources.forEach((r) => this.loadAsset(r));
+	load(uris) {
+		console.log('Loading:', uris);
+		uris.forEach((uri) => this.loadAsset(uri, () => undefined));
 	}
 
-	load(resources) {
-		console.log('Loading:', resources);
-		resources.forEach((r) => this.loadAsset(r, () => undefined));
-	}
 }

package/game/controls/ControlsController.js

@@ -1,6 +1,7 @@
 import ControllerBase from "../../core/controller/ControllerBase";
 
 export default class ControlsController extends ControllerBase {
+
 	dom;
 
 	/**
@@ -29,7 +30,7 @@ export default class ControlsController extends ControllerBase {
 
 	onKeyDown(event) {
 		const key = event.keyCode ? event.keyCode : event.charCode;
-		if (this.game.isInDebugMode.get()) console.log(key);
+		if (this.model.logPressedKeys.get()) console.log(key);
 		this.model.triggerEvent(`key-down-${key}`);
 		this.model.triggerEvent(`key-down`, key);
 	}
@@ -47,7 +48,6 @@ export default class ControlsController extends ControllerBase {
 				this.model.triggerEvent(`key-up-${key}`);
 				this.model.triggerEvent(`key-up`, key);
 		}
-
 	}
 
 	onMouseMove(e) {

package/game/controls/ControlsModel.js

@@ -10,6 +10,11 @@ export const EVENT_RIGHT_CLICK = 'right-click';
 
 export default class ControlsModel extends ObjectModel {
 
+	/**
+	 * @type BoolValue
+	 */
+	logPressedKeys;
+
 	/**
 	 * @type BoolValue
 	 */
@@ -20,14 +25,24 @@ export default class ControlsModel extends ObjectModel {
 	 */
 	mouseCoordinates;
 
+	/**
+	 * @type BoolValue
+	 */
 	mouseDownLeft;
+
+	/**
+	 * @type BoolValue
+	 */
 	mouseDownRight;
+
 	leftClickTime;
+
 	rightClickTime;
 
 	constructor() {
 		super();
 
+		this.logPressedKeys = this.addProperty('logPressedKeys', new BoolValue(false));
 		this.isMouseOver = this.addProperty('isMouseOver', new BoolValue(false));
 		this.mouseCoordinates = this.addProperty('mouseCoordinates', new Vector2());
 		this.mouseDownLeft = this.addProperty('mouseDownLeft', new BoolValue(false));

package/package.json

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