wgge 1.0.9 → 1.0.11

package/core/model/value/NullableNode.js

@@ -13,8 +13,6 @@ export default class NullableNode extends DirtyValue {
 		super(null, persistent);
 
 		this.nodeFactory = nodeFactory;
-
-		this.childRequestedRemoveHandler = () => this.set(null);
 	}
 
 	/**
@@ -24,14 +22,12 @@ 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/resources/assets/loader/AudioLoader.js

@@ -7,8 +7,20 @@ export default class AudioLoader extends AssetLoader {
 
 	loadInternal() {
 		const audio = new Audio();
-		audio.addEventListener('canplaythrough', () => this.finish(audio));
-		audio.onerror = (msg) => this.fail(msg);
+
+		const successHandler = () =>  {
+			this.finish(audio);
+			audio.removeEventListener('canplaythrough', successHandler);
+		}
+
+		const errorHandler = (msg) => {
+			this.fail(msg);
+			audio.removeEventListener('error', errorHandler);
+		}
+
+		audio.addEventListener('canplaythrough', successHandler);
+		audio.addEventListener('error', errorHandler);
+
 		audio.src = this.url();
 	}
 

package/game/resources/assets/loader/ImageLoader.js

@@ -5,11 +5,31 @@ import AssetLoader from "./AssetLoader";
  */
 export default class ImageLoader extends AssetLoader {
 
+	constructor(assets, uri, preload = false) {
+		super(assets, uri, preload);
+
+		this.image = new Image();
+
+		this.successHandler = () =>  {
+			this.finish(this.image);
+			this.imageLoadingFinished()
+		}
+
+		this.errorHandler = (msg) => {
+			this.fail(msg);
+			this.imageLoadingFinished();
+		}
+
+	}
+
 	loadInternal() {
-		const image = new Image();
-		image.onload = () => this.finish(image);
-		image.onerror = (msg) => this.fail(msg);
-		image.src = this.url();
+		this.image.addEventListener('load', this.successHandler);
+		this.image.addEventListener('error', this.errorHandler);
+		this.image.src = this.url();
 	}
 
+	imageLoadingFinished() {
+		this.image.removeEventListener('error', this.errorHandler);
+		this.image.removeEventListener('load', this.successHandler);
+	}
 }

package/package.json

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