fix type handling in ops with targeting

see #1019
t3kt · Feb 24, 2023 · f2819e8 · f2819e8
1 parent 1c34845
commit f2819e8
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 16 deletions.
diff --git a/src/operators/filter/scale.json b/src/operators/filter/scale.json
@@ -2,6 +2,6 @@
   "meta": {
     "opStatus": "default",
     "opType": "raytk.operators.filter.scale",
-    "opVersion": 26
+    "opVersion": 27
   }
 }
diff --git a/src/operators/filter/scale.tox b/src/operators/filter/scale.tox
diff --git a/src/operators/filter/scale.yaml b/src/operators/filter/scale.yaml
@@ -1,23 +1,33 @@
 !rop
 meta: !meta
   opType: raytk.operators.filter.scale
-  opVersion: '26'
+  opVersion: '27'
   opStatus: default
 opDef: !def
   enable: !expr
     expr: op('..').par.Enable
   useRuntimeBypass: true
   typeSpec: !ropTypes
+    Useinputreturntype: !expr
+      expr: op('definition_1').numRows > 1
     coordType: !coordT
       Coordtypefloat: true
       Coordtypevec2: true
       Coordtypevec3: true
     contextType: !contextT
-      Allcontexttype: true
+      Allcontexttype: !expr
+        expr: op('targetInfo')[1, 'contextType'] == '*'
+      Contexttypematerialcontext: !expr
+        expr: op('targetInfo')[1, 'contextType'] == 'MaterialContext'
     returnType: !returnT
       Allreturntype: !expr
-        expr: op('definition_1').numRows > 1
-      Returntypevec4: true
+        expr: op('definition_1').numRows > 1 and op('targetInfo')[1, 'returnType']
+          == '*'
+      Returntypesdf: !expr
+        expr: op('definition_1').numRows > 1 and op('targetInfo')[1, 'returnType']
+          in ('*', 'Sdf')
+      Returntypevec4: !expr
+        expr: op('targetInfo')[1, 'returnType'] in ('*', 'vec4')
   function: !text
     file: src/operators/filter/scale.glsl
     name: function
@@ -73,17 +83,32 @@ inputs:
     Coordtypevec2: true
     Coordtypevec3: true
   contextType: !contextT
-    Allcontexttype: true
+    Allcontexttype: !expr
+      expr: op('targetInfo')[1, 'contextType'] == '*'
+    Contexttypecontext: true
+    Contexttypematerialcontext: !expr
+      expr: op('targetInfo')[1, 'contextType'] == 'MaterialContext'
   returnType: !returnT
-    Allreturntype: true
+    Allreturntype: !expr
+      expr: op('targetInfo')[1, 'returnType'] == '*'
+    Returntypesdf: !expr
+      expr: op('targetInfo')[1, 'returnType'] in ('*', 'Sdf')
+    Returntypefloat: !expr
+      expr: op('targetInfo')[1, 'returnType'] == '*'
+    Returntypevec4: !expr
+      expr: op('targetInfo')[1, 'returnType'] in ('*', 'vec4')
 - !input
   Localalias: scaleField
   coordType: !coordT
     Coordtypefloat: true
     Coordtypevec2: true
     Coordtypevec3: true
   contextType: !contextT
-    Allcontexttype: true
+    Allcontexttype: !expr
+      expr: op('targetInfo')[1, 'contextType'] == '*'
+    Contexttypecontext: true
+    Contexttypematerialcontext: !expr
+      expr: op('targetInfo')[1, 'contextType'] == 'MaterialContext'
   returnType: !returnT
     Returntypesdf: true
     Returntypefloat: true
@@ -92,10 +117,15 @@ inputs:
 - !input
   Localalias: pivotField
   coordType: !coordT
+    Coordtypefloat: true
     Coordtypevec2: true
     Coordtypevec3: true
   contextType: !contextT
-    Allcontexttype: true
+    Allcontexttype: !expr
+      expr: op('targetInfo')[1, 'contextType'] == '*'
+    Contexttypecontext: true
+    Contexttypematerialcontext: !expr
+      expr: op('targetInfo')[1, 'contextType'] == 'MaterialContext'
   returnType: !returnT
     Returntypevec4: true
 elements:

diff --git a/src/operators/filter/transform.json b/src/operators/filter/transform.json
@@ -2,6 +2,6 @@
   "meta": {
     "opStatus": "default",
     "opType": "raytk.operators.filter.transform",
-    "opVersion": 15
+    "opVersion": 16
   }
 }
diff --git a/src/operators/filter/transform.tox b/src/operators/filter/transform.tox
diff --git a/src/operators/filter/transform.yaml b/src/operators/filter/transform.yaml
@@ -1,22 +1,32 @@
 !rop
 meta: !meta
   opType: raytk.operators.filter.transform
-  opVersion: '15'
+  opVersion: '16'
   opStatus: default
 opDef: !def
   enable: !expr
     expr: op('..').par.Enable
   useRuntimeBypass: true
   typeSpec: !ropTypes
+    Useinputreturntype: !expr
+      expr: op('definition_1').numRows > 1
     coordType: !coordT
       Coordtypevec2: true
       Coordtypevec3: true
     contextType: !contextT
-      Allcontexttype: true
+      Allcontexttype: !expr
+        expr: op('targetInfo')[1, 'contextType'] == '*'
+      Contexttypematerialcontext: !expr
+        expr: op('targetInfo')[1, 'contextType'] == 'MaterialContext'
     returnType: !returnT
       Allreturntype: !expr
-        expr: op('definition_1').numRows > 1
-      Returntypevec4: true
+        expr: op('definition_1').numRows > 1 and op('targetInfo')[1, 'returnType']
+          == '*'
+      Returntypesdf: !expr
+        expr: op('definition_1').numRows > 1 and op('targetInfo')[1, 'returnType']
+          in ('*', 'Sdf')
+      Returntypevec4: !expr
+        expr: op('targetInfo')[1, 'returnType'] in ('*', 'vec4')
   function: !text
     file: src/operators/filter/transform.glsl
     name: function_template
@@ -164,9 +174,19 @@ inputs:
     Coordtypevec2: true
     Coordtypevec3: true
   contextType: !contextT
-    Allcontexttype: true
+    Allcontexttype: !expr
+      expr: op('targetInfo')[1, 'contextType'] == '*'
+    Contexttypematerialcontext: !expr
+      expr: op('targetInfo')[1, 'contextType'] == 'MaterialContext'
   returnType: !returnT
-    Allreturntype: true
+    Allreturntype: !expr
+      expr: op('targetInfo')[1, 'returnType'] == '*'
+    Returntypesdf: !expr
+      expr: op('targetInfo')[1, 'returnType'] in ('*', 'Sdf')
+    Returntypefloat: !expr
+      expr: op('targetInfo')[1, 'returnType'] == '*'
+    Returntypevec4: !expr
+      expr: op('targetInfo')[1, 'returnType'] in ('*', 'vec4')
 elements:
 - !opElement
   name: transformTarget