wgge 2.0.33 → 2.0.37

package/core/ActivatedTreeNode.js

@@ -20,11 +20,11 @@ export default class ActivatedTreeNode {
 	/**
 	 * @type boolean
 	 */
-	isRemoved= false;
+	isRemoved = false;
 
 	/**
 	 *
-	 * @type array
+	 * @type array|null
 	 * @type param.node {ModelNode}
 	 * @type param.event {string}
 	 * @type param.handler {(ep) => any}
@@ -107,23 +107,29 @@ export default class ActivatedTreeNode {
 	}
 
 	activate() {
-		if (!this.isActivated) {
-			this.activateInternal();
-
-			if (this.autoRegisterEvents) {
-				this.autoRegisterEvents.forEach((event) => {
-					event.node.addEventListener(event.name, event.handler);
-					if (event.runOnActivate) {
-						event.handler();
-					}
-				});
+		if (this.isActivated) return;
+
+		this.activateInternal();
+
+		if (this.autoRegisterEvents) {
+			const events = this.autoRegisterEvents;
+			for (let i = 0, max = events.length; i < max; i++) {
+				const event = events[i];
+				event.node.addEventListener(event.name, event.handler);
+				if (event.runOnActivate) {
+					event.handler();
+				}
 			}
+		}
 
-			this.children.forEach((c) => c.activate());
-			this.isActivated = true;
-
-			this.afterActivatedInternal();
+		const children = this.children;
+		for (let i = 0, max = children.length; i < max; i++) {
+			children[i].activate();
 		}
+
+		this.isActivated = true;
+		this.afterActivatedInternal();
+
 	}
 
 	activateInternal() {
@@ -135,17 +141,23 @@ export default class ActivatedTreeNode {
 	}
 
 	deactivate() {
-		if (this.isActivated) {
-			if (this.autoRegisterEvents) {
-				this.autoRegisterEvents.forEach((event) => {
-					event.node.removeEventListener(event.name, event.handler);
-				});
+		if (!this.isActivated) return;
+
+		if (this.autoRegisterEvents) {
+			const events = this.autoRegisterEvents;
+			for (let i = 0, max = events.length; i < max; i++) {
+				const event = events[i];
+				event.node.removeEventListener(event.name, event.handler);
 			}
+		}
 
-			this.children.forEach((c) => c.deactivate());
-			this.deactivateInternal();
-			this.isActivated = false;
+		const children = this.children;
+		for (let i = 0, max = children.length; i < max; i++) {
+			children[i].deactivate();
 		}
+
+		this.deactivateInternal();
+		this.isActivated = false;
 	}
 
 	deactivateInternal() {
@@ -170,7 +182,7 @@ export default class ActivatedTreeNode {
 	}
 
 	addAutoEvents(node, events, handler, runOnActivate = false) {
-		events.forEach((event) => this.addAutoEvent(node, event, handler, runOnActivate));
+		events.forEach((event, i) => this.addAutoEvent(node, event, handler, i === 0 && runOnActivate));
 	}
 
 	addAutoEventMultiple(nodes, event, handler, runOnActivate = false) {

package/core/controller/TimeoutController.js

@@ -4,7 +4,7 @@ export default class TimeoutController extends ControllerBase {
 
 	/**
 	 *
-	 * @param {DemoGameModel} game
+	 * @param {GameModel} game
 	 * @param {Number} duration
 	 * @param {function} onFinished
 	 */

package/core/helper/DOMHelper.js

@@ -74,7 +74,8 @@ export default class DOMHelper {
 		return (document.fullscreenElement !== null) || (window.innerWidth === screen.width && window.innerHeight === screen.height);
 	}
 
-	static openFullscreen(elem) {
+	static openFullscreen(elem = null) {
+		if (!elem) elem = document.body;
 		if (elem.requestFullscreen) {
 			elem.requestFullscreen();
 		} else if (elem.webkitRequestFullscreen) { /* Safari */

package/core/model/event/EventManager.js

@@ -1,46 +1,49 @@
 const DEBUG_EVENT_MANAGER = false;
 
 export default class EventManager {
-	handlers;
 
-	constructor() {
-		this.handlers = [];
-	}
+	handlers = new Map();
 
 	addEventListener(eventName, eventHandler) {
-		if (!this.handlers[eventName]) {
-			this.handlers[eventName] = [];
+		if (!this.handlers.has(eventName)) {
+			this.handlers.add(eventName, [eventHandler]);
+			return;
 		}
+		/*
 		const index = this.handlers[eventName].indexOf(eventHandler);
 		if (index >= 0) {
 			if (DEBUG_EVENT_MANAGER) console.log('Event listener already registered.');
 			return;
-		}
-		return this.handlers[eventName].push(eventHandler);
+		}*/
+		const handlers = this.handlers.get(eventName);
+		handlers.push(eventHandler);
 	}
 
 	removeEventListener(eventName, eventHandler) {
-		if (!this.handlers[eventName]) {
-			this.handlers[eventName] = [];
+		if (!this.handlers.has(eventName)) {
+			return;
 		}
-		const index = this.handlers[eventName].indexOf(eventHandler);
+		const handlers = this.handlers.get(eventName);
+		const index = handlers.indexOf(eventHandler);
 		if (index >= 0) {
-			this.handlers[eventName].splice(index, 1);
+			handlers.splice(index, 1);
 		} else {
 			if (DEBUG_EVENT_MANAGER) console.log('Event listener cannot be removed - not found.');
 		}
 	}
 
 	triggerEvent(eventName, param) {
-		if (!this.handlers[eventName]) {
+		if (!this.handlers.has(eventName)) {
 			return;
 		}
-		const handlers = [...this.handlers[eventName]];
-		handlers.forEach((item) => item(param));
+		const handlers = [...this.handlers.get(eventName)];
+		for (let i = 0, max = handlers.length; i < max; i++) {
+			handlers[i](param);
+		}
 	}
 
 	reset() {
-		this.handlers = [];
+		this.handlers.clear();
 	}
 
 }

package/core/model/event/NodeWithEvents.js

@@ -28,10 +28,10 @@ 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/core/model/value/BoolValue.js

@@ -14,4 +14,8 @@ export default class BoolValue extends DirtyValue {
 		this.set(!this.get());
 	}
 
+	toggle() {
+		this.invert();
+	}
+
 }

package/package.json

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

package/core/controller/ControllerWithSaveGame.js

@@ -1,27 +0,0 @@
-import ControllerWithTimeout from "./ControllerWithTimeout";
-
-export default class ControllerWithSaveGame extends ControllerWithTimeout {
-
-	/**
-	 * @type DemoSaveGameModel
-	 */
-	saveGame;
-
-	/**
-	 * @param {DemoGameModel} game
-	 * @param {ObjectModel} model
-	 * @param {DemoSaveGameModel} saveGame
-	 */
-	constructor(game, model, saveGame = null) {
-		super(game, model);
-		if (!saveGame) {
-			saveGame = this.game.saveGame.get();
-		}
-		this.saveGame = saveGame;
-
-		if (!this.saveGame) {
-			console.error('no SaveGameModel provided for controller!');
-		}
-	}
-
-}