wgge 2.0.35 → 2.0.38

package/core/ActivatedTreeNode.js

@@ -20,7 +20,7 @@ export default class ActivatedTreeNode {
 	/**
 	 * @type boolean
 	 */
-	isRemoved= false;
+	isRemoved = false;
 
 	/**
 	 *
@@ -107,28 +107,29 @@ export default class ActivatedTreeNode {
 	}
 
 	activate() {
-		if (!this.isActivated) {
-			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();
-					}
-				}
-			}
+		if (this.isActivated) return;
 
-			const children = this.children;
-			for (let i = 0, max = children.length; i < max; i++) {
-				children[i].activate();
+		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.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() {
@@ -140,23 +141,23 @@ export default class ActivatedTreeNode {
 	}
 
 	deactivate() {
-		if (this.isActivated) {
-			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);
-				}
-			}
+		if (!this.isActivated) return;
 
-			const children = this.children;
-			for (let i = 0, max = children.length; i < max; i++) {
-				children[i].deactivate();
+		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.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() {
@@ -181,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/model/event/EventManager.js

@@ -1,46 +1,53 @@
 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.set(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 handlers = this.handlers.get(eventName);
+		const index = handlers.indexOf(eventHandler);
+		if (index === 0 && handlers.length === 0) {
+			this.handlers.delete(eventName);
+			return;
 		}
-		const index = this.handlers[eventName].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.');
+			console.warn(`Event listener '${eventName}' 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/package.json

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