🛠 fix: SamplerState

deepkolos · Jul 23, 2023 · d4f129b · d4f129b
1 parent 929009f
commit d4f129b
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 12 deletions.
diff --git a/example/demo/demoCartoonWater/CartoonWater.json b/example/demo/demoCartoonWater/CartoonWater.json
@@ -2655,8 +2655,8 @@
       "id": 28664,
       "data": {
         "outValue": {
-          "filter": "point",
-          "warp": "clamp"
+          "filter": "linear",
+          "warp": "repeat"
         },
         "outValueType": "sampler",
         "expanded": true
@@ -2684,8 +2684,8 @@
       "id": 28845,
       "data": {
         "outValue": {
-          "filter": "point",
-          "warp": "clamp"
+          "filter": "linear",
+          "warp": "repeat"
         },
         "outValueType": "sampler",
         "expanded": true
@@ -2704,17 +2704,17 @@
       },
       "blocks": [],
       "position": [
-        1288.8858125601228,
-        448.2416755020956
+        1289.1701824829677,
+        448.2417411461221
       ],
       "name": "SamplerState"
     },
     "29026": {
       "id": 29026,
       "data": {
         "outValue": {
-          "filter": "point",
-          "warp": "clamp"
+          "filter": "linear",
+          "warp": "repeat"
         },
         "outValueType": "sampler",
         "expanded": true
@@ -2734,7 +2734,7 @@
       "blocks": [],
       "position": [
         2066.96779559463,
-        336.66181536053745
+        336.846153226274
       ],
       "name": "SamplerState"
     }

diff --git a/example/demo/demoFlowMapSubGraph.json b/example/demo/demoFlowMapSubGraph.json
@@ -1408,7 +1408,13 @@
           ]
         },
         "sampler": {
-          "connections": []
+          "connections": [
+            {
+              "node": 4810,
+              "output": "out",
+              "data": {}
+            }
+          ]
         }
       },
       "outputs": {
@@ -1490,7 +1496,13 @@
           ]
         },
         "sampler": {
-          "connections": []
+          "connections": [
+            {
+              "node": 4489,
+              "output": "out",
+              "data": {}
+            }
+          ]
         }
       },
       "outputs": {
@@ -1714,6 +1726,64 @@
         372.05846716460866
       ],
       "name": "Lerp"
+    },
+    "4489": {
+      "id": 4489,
+      "data": {
+        "outValue": {
+          "filter": "point",
+          "warp": "mirror"
+        },
+        "outValueType": "sampler",
+        "expanded": true
+      },
+      "inputs": {},
+      "outputs": {
+        "out": {
+          "connections": [
+            {
+              "node": 3780,
+              "input": "sampler",
+              "data": {}
+            }
+          ]
+        }
+      },
+      "blocks": [],
+      "position": [
+        2540.626659700583,
+        744.2776345778565
+      ],
+      "name": "SamplerState"
+    },
+    "4810": {
+      "id": 4810,
+      "data": {
+        "outValue": {
+          "filter": "point",
+          "warp": "mirror"
+        },
+        "outValueType": "sampler",
+        "expanded": true
+      },
+      "inputs": {},
+      "outputs": {
+        "out": {
+          "connections": [
+            {
+              "node": 3713,
+              "input": "sampler",
+              "data": {}
+            }
+          ]
+        }
+      },
+      "blocks": [],
+      "position": [
+        2581.4578327760037,
+        234.96895611927152
+      ],
+      "name": "SamplerState"
     }
   },
   "UIState": {

diff --git a/src/rete/node.ts b/src/rete/node.ts
@@ -120,7 +120,12 @@ export class Node {
     }
 
     setValue(prefix: string, value: any) {
-        this.data[prefix + 'Value'] = value;
+        const [dataPrefix, valuePrefix] = prefix.split('.');
+        if (valuePrefix && this.data[dataPrefix + 'Value']) {
+            (this.data[dataPrefix + 'Value'] as Record<string, any>)[valuePrefix] = value;
+        } else {
+            this.data[dataPrefix + 'Value'] = value;
+        }
         this.dataChanged = true;
     }