Merge pull request #1146 from t3kt/0.37

0.37

devel/build/buildExt.py

@@ -186,7 +186,10 @@ def finalizeRootPars(self, comp: 'COMP'):
 		comp.par.externaltox = ''
 		comp.par.enablecloning = False
 		comp.par.savebackup = True
-		comp.par.reloadtoxonstart = True
+		if comp.par['reloadtoxonstart'] is not None:
+			comp.par.reloadtoxonstart = True
+		else:
+			comp.par.enableexternaltox = True
 		comp.par.reloadcustom = True
 		comp.par.reloadbuiltin = True
 		focusFirstCustomParameterPage(comp)

devel/dirtyMonitor/opFindCallbacks.py

@@ -0,0 +1,49 @@
+# me - this DAT
+# dat - the DAT that is querying
+# curOp - the OP being queried
+# row - the table row index
+
+# Uncomment following two functions to add custom columns
+
+def onInitGetColumnNames(dat):
+	return [
+		'tox',
+		'dirty'
+	]
+
+def onFindOPGetValues(dat, curOp, row):
+	return [
+		curOp.par['externaltox'],
+		curOp.dirty,
+	]
+
+
+# Return True / False to include / exclude an operator in the table
+
+def onFindOPGetInclude(dat, curOp, row):
+	return bool(curOp.par['externaltox']) and not curOp.par['clone']
+
+
+# Provide an extensive dictionary of what was matched for each operator.
+# Multiple matching tags, parameters and cells will be included.
+# For each match, a corresponding key is included in the dictionary:
+#
+#  results:
+#
+#  'name': curOp.name
+#  'type': curOp.OPType
+#  'path': curOp.path
+#  'parent' : curOp.parent()
+#  'comment': curOp.comment
+#  'tags' : [list of strings] or empty list
+#  'text' : [list of Cells] or empty list
+#  'par': dictionary of matching parameter attributes.
+#    example entries:
+#        tx : { 'name': True, 'value':True , 'expression':True } # Parameter tx matched on name, value, expression
+#        ty : { 'value' : True } # Parameter ty matched on value
+#
+
+def onOPFound(dat, curOp, row, results):
+	return
+
+

devel/tester/tester.py

@@ -220,19 +220,22 @@ def cancelTestRun(self):
 		self.log('Canceling test run...')
 		ipar.uiState.Running = False
 
-	def runQueuedTests(self):
+	def runQueuedTests(self, continueAfter=True):
 		queue = self._testQueue
 		if queue.numRows < 1:
 			raise Exception('No tests queued!')
 		self.clearResults()
 		self.log(f'Running {queue.numRows} queued tests...')
 		ipar.uiState.Running = True
-		self._runNextTest(continueAfter=True)
+		self._runNextTest(continueAfter=continueAfter)
 
 	def runAllTests(self):
 		self.reloadTestQueue()
 		self.runQueuedTests()
 
+	def runFirstQueuedTest(self):
+		self.runQueuedTests(continueAfter=False)
+
 	def _runNextTest(self, continueAfter=True):
 		queue = self._testQueue
 		if queue.numRows < 1:

docs/_data/toolkit.yaml

@@ -1 +1 @@
-toolkitVersion: '0.36'
+toolkitVersion: '0.37'

docs/_reference/operators/convert/extrude.md

@@ -32,6 +32,7 @@ op:
     - RayContext
     - ParticleContext
     coordTypes:
+    - vec2
     - vec3
     label: Height Field
     name: height_definition_in
@@ -45,6 +46,7 @@ op:
     - RayContext
     - ParticleContext
     coordTypes:
+    - vec2
     - vec3
     label: Offset Field
     name: offset_definition_in

docs/_reference/operators/field/bandField.md

@@ -142,6 +142,8 @@ op:
       the first parameter will be used.
   - label: Enable
     name: Enable
+  - label: Reverse
+    name: Reverse
   - label: Enable Repeat
     name: Enablerepeat
   - label: Repeat Size

docs/_reference/operators/field/positionField.md

@@ -46,6 +46,10 @@ op:
       name: local
     - label: Global Position
       name: global
+    - label: Pixel UV Coordinate
+      name: pixeluv
+    - label: Pixel Coordinate
+      name: pixelcoord
     name: Positiontype
   shortcuts:
   - pos

docs/_reference/operators/filter/applyTransform.md

@@ -0,0 +1,71 @@
+---
+layout: operator
+title: applyTransform
+parent: Filter Operators
+grand_parent: Operators
+permalink: /reference/operators/filter/applyTransform
+redirect_from:
+  - /reference/opType/raytk.operators.filter.applyTransform/
+op:
+  category: filter
+  inputs:
+  - contextTypes:
+    - Context
+    - MaterialContext
+    - CameraContext
+    - LightContext
+    - RayContext
+    - ParticleContext
+    coordTypes:
+    - float
+    - vec2
+    - vec3
+    - vec4
+    label: definition_in
+    name: definition_in
+    required: true
+    returnTypes:
+    - float
+    - vec4
+    - Sdf
+    - Ray
+    - Light
+    - Particle
+  - contextTypes:
+    - Context
+    - MaterialContext
+    - CameraContext
+    - LightContext
+    - RayContext
+    - ParticleContext
+    coordTypes:
+    - float
+    - vec2
+    - vec3
+    - vec4
+    label: Transform 1
+    name: transform
+    required: true
+    returnTypes:
+    - vec4
+  name: applyTransform
+  opType: raytk.operators.filter.applyTransform
+  parameters:
+  - label: Enable
+    name: Enable
+  - label: Apply To
+    menuOptions:
+    - label: Coordinates
+      name: coords
+    - label: SDF UV
+      name: sdfuv
+    - label: SDF Secondary UV
+      name: sdfuv2
+    - label: UV In Material
+      name: matuv
+    - label: Field Values
+      name: value
+    name: Target
+  status: beta
+
+---

docs/_reference/operators/filter/circularRepeat.md

@@ -23,12 +23,7 @@ op:
     name: definition_in
     required: true
     returnTypes:
-    - float
-    - vec4
     - Sdf
-    - Ray
-    - Light
-    - Particle
   name: circularRepeat
   opType: raytk.operators.filter.circularRepeat
   parameters:

docs/_reference/operators/filter/index.md

@@ -27,6 +27,8 @@ cat:
     name: adjustColor
     summary: Adjust properties of color values, either directly on a field, or on
       the assigned surface color of an Sdf result.
+  - name: applyTransform
+    status: beta
   - name: assignAttribute
     status: beta
   - keywords:
@@ -135,6 +137,8 @@ cat:
   - name: mirrorQuadrant
     summary: Mirror coordinates across two axes.
   - name: mobiusTransform
+  - name: modifyDistance
+    status: beta
   - keywords:
     - bumpmap
     - material
@@ -215,6 +219,8 @@ cat:
   - name: rangeTransform
     summary: Applies a transform based on a range of settings, mapped with either
       the iteration value or a field input.
+  - name: rectangleRepeat
+    status: beta
   - keywords:
     - flip
     - mirror
@@ -296,7 +302,9 @@ cat:
     shortcuts:
     - tfm
     summary: Transform the coordinates of the input, with rotation, scaling, and translation.
-  - name: transformSequence
+  - keywords:
+    - apply
+    name: transformSequence
     status: beta
   - keywords:
     - move