wgge 0.1.10 → 0.1.11

package/core/model/ModelBase.js

@@ -1,5 +1,9 @@
 import NodeWithEvents from "./event/NodeWithEvents";
 
+export const EVENT_REMOVE_ME = 'remove-me';
+
+export const EVENT_DIRTY = 'dirty';
+
 export default class ModelBase extends NodeWithEvents {
 
 	/**
@@ -51,7 +55,7 @@ export default class ModelBase extends NodeWithEvents {
 	makeDirty() {
 		if (!this.isDirty) {
 			this.isDirty = true;
-			this.triggerEvent('dirty');
+			this.triggerEvent(EVENT_DIRTY);
 		}
 	}
 
@@ -68,11 +72,11 @@ export default class ModelBase extends NodeWithEvents {
 	}
 
 	addOnDirtyListener(handler) {
-		this.addEventListener('dirty', handler);
+		this.addEventListener(EVENT_DIRTY, handler);
 	}
 
 	removeOnDirtyListener(handler) {
-		this.removeEventListener('dirty', handler);
+		this.removeEventListener(EVENT_DIRTY, handler);
 	}
 
 	subscribeToOnDirtyEvent(node) {
@@ -85,6 +89,10 @@ export default class ModelBase extends NodeWithEvents {
 		return node;
 	}
 
+	removeMyself() {
+		this.triggerEvent(EVENT_REMOVE_ME, this);
+	}
+
 	equalsTo(ch) {
 		return this === ch;
 	}

package/core/model/collection/ModelNodeCollection.js

@@ -2,6 +2,7 @@ import NullableNode from "../value/NullableNode";
 import Collection from "../../Collection";
 import ArrayHelper from "../../helper/ArrayHelper";
 import ObjectModel from "../ObjectModel";
+import {EVENT_REMOVE_ME} from "../ModelBase";
 
 export default class ModelNodeCollection extends ObjectModel {
 
@@ -26,8 +27,13 @@ export default class ModelNodeCollection extends ObjectModel {
 		events.forEach((event) => this.children.addEventListener(event, (param) => this.triggerEvent(event, param)));
 		this.children.addOnAddListener((child) => this.onChildAdded(child));
 		this.children.addOnRemoveListener((child) => this.onChildRemoved(child));
-		this.childDirtyHandler = (ch) => this.onChildDirty(ch);
-		this.childRequestedRemoveHandler = (ch) => this.remove(ch);
+		this.childRequestedRemoveHandler = (ch) => {
+			if (!ch) {
+				console.warn("You triggered remove-me event without passing reference to the removed element!");
+				return;
+			}
+			this.remove(ch);
+		}
 
 		this.selectedNode = this.addProperty('selectedNode', new NullableNode(null, false));
 
@@ -183,8 +189,8 @@ export default class ModelNodeCollection extends ObjectModel {
 	 */
 	onChildAdded(child) {
 		this.makeDirty();
-		child.addOnDirtyListener(this.childDirtyHandler);
-		child.addEventListener('remove-me', this.childRequestedRemoveHandler);
+		this.subscribeToOnDirtyEvent(child);
+		child.addEventListener(EVENT_REMOVE_ME, this.childRequestedRemoveHandler);
 	}
 
 	/**
@@ -193,8 +199,8 @@ export default class ModelNodeCollection extends ObjectModel {
 	 */
 	onChildRemoved(child) {
 		this.makeDirty();
-		child.removeOnDirtyListener(this.childDirtyHandler);
-		child.removeEventListener('remove-me', this.childRequestedRemoveHandler);
+		this.unsubscribeFromOnDirtyEvent(child);
+		child.removeEventListener(EVENT_REMOVE_ME, this.childRequestedRemoveHandler);
 		if (this.selectedNode.equalsTo(child)) {
 			this.selectedNode.set(null);
 		}

package/core/model/event/NodeWithEvents.js

@@ -29,4 +29,9 @@ export default class NodeWithEvents {
 		}
 	}
 
+	static isNodeWithEvents(node) {
+		if (!node) return false;
+		return (typeof node === 'object' && typeof node.addEventListener === 'function');
+	}
+
 }

package/core/model/value/NullableNode.js

@@ -1,4 +1,5 @@
 import DirtyValue from "./DirtyValue";
+import {EVENT_REMOVE_ME} from "../ModelBase";
 
 export default class NullableNode extends DirtyValue {
 	nodeFactory;
@@ -12,6 +13,8 @@ export default class NullableNode extends DirtyValue {
 		super(null, persistent);
 
 		this.nodeFactory = nodeFactory;
+
+		this.childRequestedRemoveHandler = () => this.set(null);
 	}
 
 	/**
@@ -21,12 +24,14 @@ export default class NullableNode extends DirtyValue {
 	set(value) {
 		if (this.isSet()) {
 			this.unsubscribeFromOnDirtyEvent(this.value);
+			this.value.removeEventListener(EVENT_REMOVE_ME, this.childRequestedRemoveHandler);
 		}
 
 		super.set(value);
 
 		if (this.isSet()) {
 			this.subscribeToOnDirtyEvent(this.value);
+			this.value.addEventListener(EVENT_REMOVE_ME, this.childRequestedRemoveHandler);
 		}
 	}
 

package/game/controls/ControlsModel.js

@@ -4,6 +4,10 @@ import BoolValue from "../../core/model/value/BoolValue";
 
 const CLICK_TIMEOUT = 250;
 
+export const EVENT_LEFT_CLICK = 'left-click';
+
+export const EVENT_RIGHT_CLICK = 'right-click';
+
 export default class ControlsModel extends ObjectModel {
 
 	/**
@@ -41,7 +45,7 @@ export default class ControlsModel extends ObjectModel {
 			this.leftClickTime = time;
 		} else {
 			if ((time - this.leftClickTime) < CLICK_TIMEOUT) {
-				this.triggerEvent('left-click', this.mouseCoordinates.clone());
+				this.triggerEvent(EVENT_LEFT_CLICK, this.mouseCoordinates.clone());
 			}
 		}
 	}
@@ -52,7 +56,7 @@ export default class ControlsModel extends ObjectModel {
 			this.rightClickTime = time;
 		} else {
 			if ((time - this.rightClickTime) < CLICK_TIMEOUT) {
-				this.triggerEvent('right-click', this.mouseCoordinates.clone());
+				this.triggerEvent(EVENT_RIGHT_CLICK, this.mouseCoordinates.clone());
 			}
 		}
 	}

package/game/resources/assets/AssetCache.js

@@ -167,6 +167,14 @@ export default class AssetCache extends NodeWithEvents {
 		}
 	}
 
+	loadAsset(uri, onLoaded) {
+		this.getAsset(uri, onLoaded);
+	}
+	
+	loadImage(url, onLoaded) {
+		this.getAsset(url, onLoaded);
+	}
+
 	loadMaterial(materialId, onLoaded) {
 		this.getAsset(`mat/${materialId}`, onLoaded);
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wgge",
-	"version": "0.1.10",
+	"version": "0.1.11",
 	"description": "Web GL Game Engine",
 	"main": "index.js",
 	"dependencies": {