object simplification

Author: ptc-rdeleeuw

addons/vuforia-spatial-core-addon

@@ -17,17 +17,8 @@ class AnchoredGroupNode extends ObjectNode {
      *
      * @param {ObjectInterface} listener
      */
-    constructor(listener) {
-        super(listener, AnchoredGroupNode.TYPE);
-    }
-
-    /**
-     *
-     * @param {string} toolId
-     * @returns {AnchoredGroupNodeState}
-     */
-    getStateForTool(toolId) {
-        return {};
+    constructor() {
+        super(AnchoredGroupNode.TYPE);
     }
 }
 

libraries/objectDefaultFiles/scene/AnchoredGroupNode.js

@@ -6,7 +6,7 @@ class BaseEntity {
     /** @type {{order: number, component: ComponentInterface}[]} */
     #components;
 
-    /** @type {EntityInterface} */
+    /** @type {{[key: string]: BaseEntity}} */
     #children;
 
     constructor() {
@@ -84,6 +84,9 @@ class BaseEntity {
      */
     updateComponents() {
         for (let entry of this.#components) {
+            if (!entry || !entry.component || !entry.component.update) {
+                console.log("here");
+            }
             entry.component.update();
         }
         for (let child of Object.values(this.#children)) {
@@ -117,15 +120,6 @@ class BaseEntity {
         delete this.#children[key];
     }
 
-    /**
-     *
-     * @param {string} _name
-     * @returns {BaseEntity}
-     */
-    createEntity(_name) {
-        throw Error("Can't instantiate abstract class");
-    }
-
     /**
      *
      */

libraries/objectDefaultFiles/scene/AnchoredGroupStore.js

@@ -1,4 +1,7 @@
+import ComponentsNode from "./ComponentsNode.js";
+import EntitiesNode from "./EntitiesNode.js";
 import ObjectNode from "./ObjectNode.js";
+import TransformComponentNode from "./TransformComponentNode.js";
 
 /**
  * @typedef {import("./BaseNode.js").BaseNodeState} BaseNodeState
@@ -16,28 +19,26 @@ import ObjectNode from "./ObjectNode.js";
  * @typedef {{getPosition: () => Vector3Value, setPosition: (position: Vector3Value) => void, getRotation: () => QuaternionValue, setRotation: (rotation: QuaternionValue) => void, getScale: () => Vector3Value, setScale: (scale: Vector3Value) => void}} EntityInterface
  */
 
-class EntityNode extends ObjectNode {
+class BaseEntityNode extends ObjectNode {
     static TYPE = "Object.Entity";
 
+    /** @tpye {EntityInterface} */
+    #entity;
+    
     /**
-     *
-     * @param {DictionaryInterface} listener
+     * @param {EntityInterface} entity
      * @param {string} type
      */
-    constructor(listener, type = EntityNode.TYPE) {
-        super(listener, type);
-        this.get("components").setEntityNode(this);
-        if (!this.get("components").has("0")) {
-            this.get("components").set("0", listener.createTransform(), false);
-        }
+    constructor(entity, type = BaseEntityNode.TYPE) {
+        super(type);
+        this._set("children", new EntitiesNode(this));
+        this._set("components", new ComponentsNode(this));
+        this.#entity = entity
+        this.setComponent("0", new TransformComponentNode(this.#entity), false);
     }
 
-    /**
-     *
-     * @returns {EntityInterface|null}
-     */
-    getEntity() {
-        return this.getListener().getEntity();
+    get entity() {
+        return this.#entity;
     }
 
     /**
@@ -62,20 +63,12 @@ class EntityNode extends ObjectNode {
         this.get("children").set(name, entity, makeDirty);
     }
 
-    createEntity(key, state) {
-        return this.getListener().createEntity(key, state);
-    }
-
-    createComponent(order, state) {
-        return this.getListener().createComponent(order, state);
-    }
-
     /**
      *
      * @param {number} order
      * @param {ComponentNode} component
      */
-    addComponent(order, component, makeDirty = true) {
+    setComponent(order, component, makeDirty = true) {
         this.get("components").set(order, component, makeDirty);
     }
 
@@ -95,24 +88,29 @@ class EntityNode extends ObjectNode {
         return this.getComponentByType(type) !== undefined;
     }
 
-    setPosition(x, y, z) {
+    /**
+     * @param {Vector3Value} value
+     */
+    set position(value) {
         const transform = this.get("components").get(0);
-        transform.setPosition({x, y, z});
+        transform.position = value;
     }
 
-    setRotation(x, y, z, w) {
+    /**
+     * @param {QuaternionValue} value
+     */
+    set rotation(value) {
         const transform = this.get("components").get(0);
-        transform.setRotation({x, y, z, w});
+        transform.rotation = value;
     }
 
-    setScale(x, y, z) {
+    /**
+     * @param {Vector3Value} value
+     */
+    set scale(value) {
         const transform = this.get("components").get(0);
-        transform.setScale({x, y, z});
-    }
-
-    dispose() {
-        this.getEntity().dispose();
+        transform.scale = value;
     }
 }
 
-export default EntityNode;
+export default BaseEntityNode;

libraries/objectDefaultFiles/scene/BaseEntity.js

@@ -28,9 +28,8 @@ class BaseNode {
      * @returns {string|null}
      */
     getName() {
-        const parent = this.getParent();
-        if (parent) {
-            for (const entry of parent.entries()) {
+        if (this.parent) {
+            for (const entry of this.parent.entries()) {
                 if (entry[1] === this) {
                     return entry[0];
                 }
@@ -43,7 +42,7 @@ class BaseNode {
      *
      * @returns {BaseNode|null}
      */
-    getParent() {
+    get parent() {
         const parent = this.#parent ? this.#parent.deref() : null;
         return parent ? parent : null;
     }
@@ -52,7 +51,7 @@ class BaseNode {
      * internal use only, doesn't propogate isDirty
      * @param {BaseNode|null} parent
      */
-    setParent(parent) {
+    set parent(parent) {
         this.#parent = parent ? new WeakRef(parent) : null;
     }
 
@@ -139,7 +138,7 @@ class BaseNode {
      * @param {BaseNode} node
      */
     static setParentDirty(node) {
-        const parent = node.getParent();
+        const parent = node.parent;
         if (parent && (!parent.isInternalDirty())) {
             parent.setInternalDirty();
             BaseNode.setParentDirty(parent);

…s/objectDefaultFiles/scene/EntityNode.js …jectDefaultFiles/scene/BaseEntityNode.jslibraries/objectDefaultFiles/scene/EntityNode.js renamed to libraries/objectDefaultFiles/scene/BaseEntityNode.js libraries/objectDefaultFiles/scene/EntityNode.js renamed to libraries/objectDefaultFiles/scene/BaseEntityNode.js

@@ -1,44 +1,87 @@
 import ObjectNode from "./ObjectNode.js";
+import ValueNode from "./ValueNode.js";
 
 /**
  * @typedef {import("./BaseNode.js").BaseNodeDelta} BaseNodeDelta
  * @typedef {import("./ValueNode.js").ValueNodeDelta} ValueNodeDelta
  * @typedef {import("./ObjectNode.js").ObjectInterface} ObjectInterface
  * @typedef {{r: number, g: number, b: number}} ColorValue
  * @typedef {BaseNodeDelta & {properties?: {r?: ValueNodeDelta, g?: ValueNodeDelta, b?: ValueNodeDelta}}} ColorDelta
+ * @typedef {(node: ColorNode) => void} onChangedFunc
  */
 
 class ColorNode extends ObjectNode {
     static TYPE = "Object.Color";
 
+    /** @type {onChangedFunc|null} */
+    #onChanged
+
     /**
      *
-     * @param {ObjectInterface} listener
+     * @param {ObjectInterface} value
      */
-    constructor(listener) {
-        super(listener, ColorNode.TYPE);
+    constructor(value = {r: 0, g: 0, b: 0}) {
+        super(ColorNode.TYPE);
+        this.#addValue("r", value.r);
+        this.#addValue("g", value.g);
+        this.#addValue("b", value.b);
+        this.#onChanged = null;
     }
 
     /**
-     * @param {ColorValue} value
+     * 
+     * @param {string} key 
+     * @param {number} value 
      */
-    setValue(value) {
-        this.get("r").value = value.r;
-        this.get("g").value = value.g;
-        this.get("b").value = value.b;
+    #addValue(key, value) {
+        const node = new ValueNode(value);
+        node.onChanged = (_node) => {this.#safeOnChanged();};
+        this._set(key, node);
+    }
+
+    /**
+     * 
+     */
+    #safeOnChanged() {
+        if (this.#onChanged) {
+            this.#onChanged(this);
+        }
+    }
+
+    /**
+     * @returns {onChangedFunc} 
+     */
+    get onChanged() {
+        return this.#onChanged;
+    }
+    
+    /**
+     * @param {onChangedFunc} onChanged
+     */
+    set onChanged(onChanged) {
+        this.#onChanged = onChanged;
     }
 
     /**
      *
      * @returns {ColorValue}
      */
-    getValue() {
+    get value() {
         return {
             "r": this.get("r").value,
             "g": this.get("g").value,
             "b": this.get("b").value
         };
     }
+
+    /**
+     * @param {ColorValue} value
+     */
+    set value(value) {
+        this.get("r").value = value.r;
+        this.get("g").value = value.g;
+        this.get("b").value = value.b;
+    }
 }
 
 export default ColorNode;