wgge 2.0.28 → 2.0.30

package/core/ActivatedTreeNode.js

@@ -17,6 +17,11 @@ export default class ActivatedTreeNode {
 	 */
 	isActivated;
 
+	/**
+	 * @type boolean
+	 */
+	isRemoved= false;
+
 	/**
 	 *
 	 * @type array
@@ -26,6 +31,11 @@ export default class ActivatedTreeNode {
 	 */
 	autoRegisterEvents = null;
 
+	/**
+	 * @type boolean
+	 */
+	childWasRemoved = false;
+
 	constructor() {
 		this.isActivated = false;
 		this.parent = null;
@@ -61,18 +71,13 @@ export default class ActivatedTreeNode {
 	removeChild(node) {
 		const index = this.children.indexOf(node);
 		if (index >= 0) {
-			this.children.splice(index, 1);
+			this.childWasRemoved = true;
 			node.deactivate();
+			node.isRemoved = true;
 			node.parent = null;
 			return node;
 		}
-		for (let i = 0, max = this.children.length; i < max; i++) {
-			const child = this.children[i];
-			const result = child.removeChild(node);
-			if (result) {
-				return result;
-			}
-		}
+		return undefined;
 	}
 
 	removeMyself() {
@@ -86,13 +91,17 @@ export default class ActivatedTreeNode {
 	resetChildren() {
 		this.children.forEach((child) => child.deactivate());
 		this.children = [];
+		this.childWasRemoved = false;
 	}
 
-	forEach(func) {
-		func(this);
-		for (let i = 0, max = this.children.length; i < max; i++) {
-			const child = this.children[i];
-			child.forEach(func);
+	updateRemovedChildren() {
+		if (this.childWasRemoved) {
+			let w = 0;
+			for (let i = 0, max = this.children.length; i < max; i++) {
+				if (!this.children[i].isRemoved) this.children[w++] = this.children[i];
+			}
+			this.children.length = w;
+			this.childWasRemoved = false
 		}
 	}
 

package/core/controller/ControllerBase.js

@@ -35,22 +35,19 @@ export default class ControllerBase extends ActivatedTreeNode {
 		}
 
 		if (this.updateActions.length > 0) {
-			this.updateActions.forEach((action) => action(delta));
+			for (let i = 0, max = this.updateActions.length; i < max; i++) {
+				this.updateActions[i](delta);
+			}
 			this.updateActions = [];
 		}
 
 		this.updateInternal(delta);
 
-		if (this.children.length > 0) {
-			// this make sure all children are updated even if some of them are removed during processing
-			for (let i = 0, max = this.children.length; i < max; i++) {
-				this.updateActions.push(() => this.children[i].update(delta));
-			}
-			for (let i = 0, max = this.updateActions.length; i < max; i++) {
-				this.updateActions[i]();
-			}
-			this.updateActions = [];
+		for (let i = 0, max = this.children.length; i < max; i++) {
+			this.children[i].update(delta);
 		}
+
+		this.updateRemovedChildren();
 	}
 
 	updateInternal(delta) {

package/core/renderer/RendererBase.js

@@ -33,7 +33,11 @@ export default class RendererBase extends ActivatedTreeNode {
 
 		this.renderInternal();
 
-		this.children.forEach((c) => c.render());
+		for (let i = 0, max = this.children.length; i < max; i++) {
+			this.children[i].render();
+		}
+
+		this.updateRemovedChildren();
 
 		if (this.isRoot()) {
 			this.model.clean();

package/package.json

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