simplified value nodes

- merged ValueStore and TriggerValueStore into ValueNode
ptcrealitylab · Jun 17, 2024 · 71a4406 · 71a4406
1 parent b5775c7
commit 71a4406
Show file tree

Hide file tree

Showing 30 changed files with 264 additions and 275 deletions.
diff --git a/libraries/objectDefaultFiles/scene/BaseNode.js b/libraries/objectDefaultFiles/scene/BaseNode.js
@@ -17,7 +17,7 @@ class BaseNode {
      *
      * @param {string} type
      */
-    constructor(type, name = "") {
+    constructor(type) {
         this.#type = type;
         this.#isTypeDirty = false;
         this.#parent = null;

diff --git a/libraries/objectDefaultFiles/scene/ColorNode.js b/libraries/objectDefaultFiles/scene/ColorNode.js
@@ -23,9 +23,9 @@ class ColorNode extends ObjectNode {
      * @param {ColorValue} value
      */
     setValue(value) {
-        this.get("r").set(value.r);
-        this.get("g").set(value.g);
-        this.get("b").set(value.b);
+        this.get("r").value = value.r;
+        this.get("g").value = value.g;
+        this.get("b").value = value.b;
     }
 
     /**
@@ -34,9 +34,9 @@ class ColorNode extends ObjectNode {
      */
     getValue() {
         return {
-            "r": this.get("r").get(),
-            "g": this.get("g").get(),
-            "b": this.get("b").get()
+            "r": this.get("r").value,
+            "g": this.get("g").value,
+            "b": this.get("b").value
         };
     }
 }

diff --git a/libraries/objectDefaultFiles/scene/ColorStore.js b/libraries/objectDefaultFiles/scene/ColorStore.js
@@ -1,6 +1,5 @@
 import ObjectStore from "./ObjectStore.js";
 import ValueNode from "./ValueNode.js";
-import ValueStore from "./ValueStore.js";
 
 /**
  * @typedef {import("./ObjectNode.js").NodeDict} NodeDict
@@ -28,9 +27,9 @@ class ColorStore extends ObjectStore {
      */
     getProperties(_thisNode) {
         return {
-            "r": new ValueNode(new ValueStore(this.#initValues.r)),
-            "g": new ValueNode(new ValueStore(this.#initValues.g)),
-            "b": new ValueNode(new ValueStore(this.#initValues.b))
+            "r": new ValueNode(this.#initValues.r),
+            "g": new ValueNode(this.#initValues.g),
+            "b": new ValueNode(this.#initValues.b)
         };
     }
 }

diff --git a/libraries/objectDefaultFiles/scene/DictionaryStore.js b/libraries/objectDefaultFiles/scene/DictionaryStore.js
@@ -1,7 +1,6 @@
 import DictionaryNode from "./DictionaryNode.js";
 import ValueNode from "./ValueNode.js";
 import VersionedNode from "./VersionedNode.js";
-import ValueStore from "./ValueStore.js";
 
 /**
  * @typedef {import("./ObjectNode").ObjectNodeState} ObjectNodeState
@@ -35,15 +34,15 @@ class DictionaryStore {
                 if (!state.hasOwnProperty("value")) {
                     throw Error("Can't create ValueNode without initial value");
                 }
-                return new ValueNode(new ValueStore(state.value), state.type);
+                return new ValueNode(state.value, state.type);
             } else if (state.type.startsWith("Versioned")) {
                 if (!state.hasOwnProperty("value")) {
                     throw Error("Can't create VaersionedNode without initial value");
                 }
                 if (!state.hasOwnProperty("version")) {
                     throw Error("Can't create VersionedNode without initial version");
                 }
-                return new VersionedNode(new ValueStore(state.value), state.type, null, state.version);
+                return new VersionedNode(state.value, state.type, state.version);
             } else {
                 throw Error("Can't create property with type: " + state.type);
             }

diff --git a/libraries/objectDefaultFiles/scene/EulerAnglesNode.js b/libraries/objectDefaultFiles/scene/EulerAnglesNode.js
@@ -23,10 +23,10 @@ class EulerAnglesNode extends ObjectNode {
      * @param {EulerAnglesValue} value
      */
     setValue(value) {
-        this.get("x").set(value.x);
-        this.get("y").set(value.y);
-        this.get("z").set(value.z);
-        this.get("order").set(value.order);
+        this.get("x").value = value.x;
+        this.get("y").value = value.y;
+        this.get("z").value = value.z;
+        this.get("order").value = value.order;
     }
 
     /**
@@ -35,10 +35,10 @@ class EulerAnglesNode extends ObjectNode {
      */
     getValue() {
         return {
-            "x": this.get("x").get(),
-            "y": this.get("y").get(),
-            "z": this.get("z").get(),
-            "order": this.get("order").get()
+            "x": this.get("x").value,
+            "y": this.get("y").value,
+            "z": this.get("z").value,
+            "order": this.get("order").value
         };
     }
 }

diff --git a/libraries/objectDefaultFiles/scene/EulerAnglesStore.js b/libraries/objectDefaultFiles/scene/EulerAnglesStore.js
@@ -1,6 +1,5 @@
 import ObjectStore from "./ObjectStore.js";
 import ValueNode from "./ValueNode.js";
-import ValueStore from "./ValueStore.js";
 
 /**
  * @typedef {import("./ObjectNode.js").NodeDict} NodeDict
@@ -28,10 +27,10 @@ class EulerAnglesStore extends ObjectStore {
      */
     getProperties(_thisNode) {
         return {
-            "x": new ValueNode(new ValueStore(this.#initValues.x)),
-            "y": new ValueNode(new ValueStore(this.#initValues.y)),
-            "z": new ValueNode(new ValueStore(this.#initValues.z)),
-            "order": new ValueNode(new ValueStore(this.#initValues.order))
+            "x": new ValueNode(this.#initValues.x),
+            "y": new ValueNode(this.#initValues.y),
+            "z": new ValueNode(this.#initValues.z),
+            "order": new ValueNode(this.#initValues.order)
         };
     }
 }

diff --git a/libraries/objectDefaultFiles/scene/GLTFLoaderComponentNode.js b/libraries/objectDefaultFiles/scene/GLTFLoaderComponentNode.js
@@ -12,7 +12,7 @@ class GLTFLoaderComponentNode extends BaseComponentNode {
     }
 
     setUrl(url) {
-        this.get("url").set(url);
+        this.get("url").value = url;
     }
 
     setEntityNode(node) {

diff --git a/libraries/objectDefaultFiles/scene/GLTFLoaderComponentStore.js b/libraries/objectDefaultFiles/scene/GLTFLoaderComponentStore.js
@@ -1,6 +1,5 @@
 import ObjectStore from "./ObjectStore.js";
 import VersionedNode from "./VersionedNode.js";
-import ValueStore from "./ValueStore.js";
 
 /**
  * @typedef {import("./ObjectNode.js").NodeDict} NodeDict
@@ -23,7 +22,7 @@ class GLTFLoaderComponentStore extends ObjectStore {
      */
     getProperties(_thisNode) {
         return {
-            "url": new VersionedNode(new ValueStore(""))
+            "url": new VersionedNode("")
         };
     }
 

diff --git a/libraries/objectDefaultFiles/scene/MaterialComponentStore.js b/libraries/objectDefaultFiles/scene/MaterialComponentStore.js
@@ -1,6 +1,5 @@
 import ObjectStore from "./ObjectStore.js";
 import ValueNode from "./ValueNode.js";
-import ValueStore from "./ValueStore.js";
 import DictionaryNode from "./DictionaryNode.js";
 import DictionaryStore from "./DictionaryStore.js";
 
@@ -11,7 +10,7 @@ class MaterialComponentStore extends ObjectStore {
 
     getProperties() {
         return {
-            "material": new ValueNode(new ValueStore()),
+            "material": new ValueNode(""),
             "properties": new DictionaryNode(new DictionaryStore())
         };
     }

diff --git a/libraries/objectDefaultFiles/scene/QuaternionNode.js b/libraries/objectDefaultFiles/scene/QuaternionNode.js
@@ -24,10 +24,10 @@ class QuaternionNode extends ObjectNode {
      * @param {QuaternionValue} value
      */
     setValue(value) {
-        this.get("x").set(value.x);
-        this.get("y").set(value.y);
-        this.get("z").set(value.z);
-        this.get("w").set(value.w);
+        this.get("x").value = value.x;
+        this.get("y").value = value.y;
+        this.get("z").value = value.z;
+        this.get("w").value = value.w;
     }
 
 
@@ -37,10 +37,10 @@ class QuaternionNode extends ObjectNode {
      */
     getValue() {
         return {
-            "x": this.get("x").get(),
-            "y": this.get("y").get(),
-            "z": this.get("z").get(),
-            "w": this.get("w").get()
+            "x": this.get("x").value,
+            "y": this.get("y").value,
+            "z": this.get("z").value,
+            "w": this.get("w").value
         };
     }
 }

diff --git a/libraries/objectDefaultFiles/scene/QuaternionStore.js b/libraries/objectDefaultFiles/scene/QuaternionStore.js
@@ -1,6 +1,5 @@
 import ObjectStore from "./ObjectStore.js";
 import ValueNode from "./ValueNode.js";
-import ValueStore from "./ValueStore.js";
 
 /**
  * @typedef {import("./ObjectNode.js").NodeDict} NodeDict
@@ -27,10 +26,10 @@ class QuaternionStore extends ObjectStore {
      */
     getProperties(_node) {
         return {
-            "x": new ValueNode(new ValueStore(this.#initValues.x)),
-            "y": new ValueNode(new ValueStore(this.#initValues.y)),
-            "z": new ValueNode(new ValueStore(this.#initValues.z)),
-            "w": new ValueNode(new ValueStore(this.#initValues.w))
+            "x": new ValueNode(this.#initValues.x),
+            "y": new ValueNode(this.#initValues.y),
+            "z": new ValueNode(this.#initValues.z),
+            "w": new ValueNode(this.#initValues.w)
         };
     }
 }

diff --git a/libraries/objectDefaultFiles/scene/SimpleAnimationComponentNode.js b/libraries/objectDefaultFiles/scene/SimpleAnimationComponentNode.js
@@ -2,7 +2,7 @@ import ObjectNode from "./ObjectNode.js";
 import SimpleAnimationComponentStore from "./SimpleAnimationComponentStore.js";
 
 /**
- * @typedef {import("../three/addons/Timer.js").Timer} Timer
+ * @typedef {import("../three/addons/DateTimer.js").Timer} Timer
  * @typedef {import("./Vector3Node").Vector3Value} Vector3Value;
  * @typedef {number} Seconds
  * @typedef {(timestamp: Seconds) => Vector3Value} animationFunc
@@ -82,19 +82,19 @@ class SimpleAnimationComponentNode extends ObjectNode {
             sample = this.#animation(timestamp);
             if (this.#isInitialized) {
                 this.get("oldSample").setValue(this.get("newSample").getValue());
-                this.get("oldTimestamp").set(this.get("newTimestamp").get());
+                this.get("oldTimestamp").value = this.get("newTimestamp").value;
             } else {
                 this.get("oldSample").setValue(sample);
-                this.get("oldTimestamp").set(timestamp - 1);
+                this.get("oldTimestamp").value = timestamp - 1;
                 this.#isInitialized = true;
             }
             this.get("newSample").setValue(sample);
-            this.get("newTimestamp").set(timestamp);
+            this.get("newTimestamp").value = timestamp;
         } else {
             const oldSample = this.get("oldSample").getValue();
-            const oldTimestamp = this.get("oldTimestamp").get();
+            const oldTimestamp = this.get("oldTimestamp").value;
             const newSample = this.get("newSample").getValue();
-            const newTimestamp = this.get("newTimestamp").get();
+            const newTimestamp = this.get("newTimestamp").value;
             const interp = (timestamp - oldTimestamp) / (newTimestamp - oldTimestamp);
             sample.x = oldSample.x + (interp * (newSample.x - oldSample.x));
             sample.y = oldSample.y + (interp * (newSample.y - oldSample.y));

diff --git a/libraries/objectDefaultFiles/scene/SimpleAnimationComponentStore.js b/libraries/objectDefaultFiles/scene/SimpleAnimationComponentStore.js
@@ -2,19 +2,22 @@ import ObjectStore from "./ObjectStore.js";
 import Vector3Node from "./Vector3Node.js";
 import Vector3Store from "./Vector3Store.js";
 import ValueNode from "./ValueNode.js";
-import ValueStore from "./ValueStore.js";
 
 class SimpleAnimationComponentStore extends ObjectStore {
     constructor() {
         super();
     }
 
+    /**
+     * 
+     * @returns {{oldSample: Vector3Node, oldTimestamp: ValueNode<number>, newSample: Vector3Node, newTimestamp: ValueNode<number>}}
+     */
     getProperties() {
         return {
             "oldSample": new Vector3Node(new Vector3Store()),
-            "oldTimestamp": new ValueNode(new ValueStore(0)),
+            "oldTimestamp": new ValueNode(0),
             "newSample": new Vector3Node(new Vector3Store()),
-            "newTimestamp": new ValueNode(new ValueStore(0))
+            "newTimestamp": new ValueNode(0)
         };
     }
 }

diff --git a/libraries/objectDefaultFiles/scene/TextureStore.js b/libraries/objectDefaultFiles/scene/TextureStore.js
@@ -1,12 +1,12 @@
 import ObjectStore from "./ObjectStore.js";
 import ValueNode from "./ValueNode.js";
-import ValueStore from "./ValueStore.js";
 import {UVMapping, ClampToEdgeWrapping, LinearFilter} from "../../thirdPartyCode/three/three.module.js";
 
 /**
  * @typedef {import("./ObjectNode.js").NodeDict} NodeDict
  * @typedef {import("./TextureNode.js").default} TextureNode
  * @typedef {import("./TextureNode.js").TextureValue} TextureValue
+ * @typedef {string} resourceId
  */
 
 class TextureStore extends ObjectStore {
@@ -25,17 +25,17 @@ class TextureStore extends ObjectStore {
     /**
      * @override
      * @param {TextureNode} _thisNode
-     * @returns {{id: ValueNode}}
+     * @returns {{id: ValueNode<resourceId>, mapping: ValueNode<number>, wrapS: ValueNode<number>, wrapT: ValueNode<number>, magFilter: ValueNode<number>, minFilter: ValueNode<number>, anisotropy: ValueNode<number>}}
      */
     getProperties(_thisNode) {
         return {
-            "id": new ValueNode(new ValueStore(this.#initValues.id)),
-            "mapping": new ValueNode(new ValueStore(this.#initValues.mapping)),
-            "wrapS": new ValueNode(new ValueStore(this.#initValues.wrapS)),
-            "wrapT": new ValueNode(new ValueStore(this.#initValues.wrapT)),
-            "magFilter": new ValueNode(new ValueStore(this.#initValues.magFilter)),
-            "minFilter": new ValueNode(new ValueStore(this.#initValues.minFilter)),
-            "anisotropy": new ValueNode(new ValueStore(this.#initValues.anisotropy))
+            "id": new ValueNode(this.#initValues.id),
+            "mapping": new ValueNode(this.#initValues.mapping),
+            "wrapS": new ValueNode(this.#initValues.wrapS),
+            "wrapT": new ValueNode(this.#initValues.wrapT),
+            "magFilter": new ValueNode(this.#initValues.magFilter),
+            "minFilter": new ValueNode(this.#initValues.minFilter),
+            "anisotropy": new ValueNode(this.#initValues.anisotropy)
         };
     }
 }

diff --git a/libraries/objectDefaultFiles/scene/Tool3D.js b/libraries/objectDefaultFiles/scene/Tool3D.js
@@ -145,7 +145,7 @@ class Tool3D {
         if (this.#toolNode) {
             const component = this.#toolNode.getComponentByType(VisibilityComponentNode.TYPE);
             if (component) {
-                component.set(isVisible);
+                component.value = isVisible;
             }
         }
     }

diff --git a/libraries/objectDefaultFiles/scene/TriggerValueStore.js b/libraries/objectDefaultFiles/scene/TriggerValueStore.js
diff --git a/libraries/objectDefaultFiles/scene/ValueComponentNode.js b/libraries/objectDefaultFiles/scene/ValueComponentNode.js
@@ -1,9 +1,8 @@
 import ValueNode from "./ValueNode.js";
-import ValueStore from "./ValueStore.js";
 
 class ValueComponentNode extends ValueNode {
     constructor(value, type) {
-        super(new ValueStore(value), type);
+        super(value, type);
     }
 
     /**