wgge 2.0.32 → 2.0.35

package/core/ActivatedTreeNode.js

@@ -24,7 +24,7 @@ export default class ActivatedTreeNode {
 
 	/**
 	 *
-	 * @type array
+	 * @type array|null
 	 * @type param.node {ModelNode}
 	 * @type param.event {string}
 	 * @type param.handler {(ep) => any}
@@ -111,17 +111,22 @@ export default class ActivatedTreeNode {
 			this.activateInternal();
 
 			if (this.autoRegisterEvents) {
-				this.autoRegisterEvents.forEach((event) => {
+				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;
+			const children = this.children;
+			for (let i = 0, max = children.length; i < max; i++) {
+				children[i].activate();
+			}
 
+			this.isActivated = true;
 			this.afterActivatedInternal();
 		}
 	}
@@ -137,12 +142,18 @@ export default class ActivatedTreeNode {
 	deactivate() {
 		if (this.isActivated) {
 			if (this.autoRegisterEvents) {
-				this.autoRegisterEvents.forEach((event) => {
+				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);
-				});
+				}
+			}
+
+			const children = this.children;
+			for (let i = 0, max = children.length; i < max; i++) {
+				children[i].deactivate();
 			}
 
-			this.children.forEach((c) => c.deactivate());
 			this.deactivateInternal();
 			this.isActivated = 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

@@ -71,10 +71,11 @@ export default class DOMHelper {
 	}
 
 	static isFullscreen() {
-		return (window.fullScreen || (window.innerWidth == screen.width && window.innerHeight == screen.height))
+		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 */
@@ -87,7 +88,9 @@ export default class DOMHelper {
 
 	static closeFullscreen() {
 		if (document.exitFullscreen) {
-			document.exitFullscreen();
+			document.exitFullscreen()
+				.then(() => console.log('Switched to fullscreen'))
+				.catch((e) => console.error('Fullscreen failed', e));
 		} else if (document.webkitExitFullscreen) { /* Safari */
 			document.webkitExitFullscreen();
 		} else if (document.msExitFullscreen) { /* IE11 */

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.32",
+	"version": "2.0.35",
 	"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!');
-		}
-	}
-
-}