Merge pull request #1228 from t3kt/0.41

0.41

devel/build/buildAsyncExt.py

@@ -324,6 +324,7 @@ async def _processOperator(self, comp: COMP):
 		self.context.resetCustomPars(comp)
 		self.context.lockROPPars(comp)
 		await self._processOperatorSubCompChildren(comp)
+		self.context.consolidateOperatorPythonModules(comp)
 		if not comp.isPanel:
 			comp.showCustomOnly = True
 			self.log('Updating OP image for ' + comp.path)
@@ -408,7 +409,7 @@ async def _consolidateSharedPythonMods(self):
 	async def _removeAllBuildExcludeOps(self, scope: COMP):
 		self.log(f'Removing buildExclude ops in {scope}')
 		toRemove = scope.findChildren(tags=[RaytkTags.buildExclude.name], includeUtility=True)
-		chunks = [list(chunk) for chunk in chunked_iterable(toRemove, 30)]
+		chunks = [list(chunk) for chunk in chunked_iterable(toRemove, 100)]
 		self.log(f'Found {len(toRemove)} ops to remove in {len(chunks)} chunks')
 		total = len(chunks)
 		for i in range(total):

devel/profiler/profiler.py

@@ -0,0 +1,9 @@
+# noinspection PyUnreachableCode
+if False:
+	# noinspection PyUnresolvedReferences
+	from _stubs import *
+	from _typeAliases import *
+
+class Profiler:
+	def __init__(self, ownerComp: COMP):
+		self.ownerComp = ownerComp

devel/toolkitEditor/mainMenu/mainMenu.py

@@ -95,6 +95,12 @@ def __init__(self, ownerComp: COMP):
 					menuName='Tools',
 					action=lambda: ext.toolkitEditor.saveAllROPs(incrementVersion=True),
 				),
+				_MenuItem(
+					'updateAllShaderLibraries',
+					'Update All Shader Libraries',
+					menuName='Tools',
+					action=lambda: ext.toolkitEditor.updateAllShaderLibraries(),
+				),
 			],
 		}
 

devel/toolkitEditor/toolkitEditor.py

@@ -26,3 +26,13 @@ def saveAllROPSpecs():
 
 	def saveAllROPs(self, incrementVersion):
 		RaytkTools().saveAllROPs(incrementVersion)
+
+	def updateAllShaderLibraries(self):
+		for area in ops('/raytk', '/devel', '/toolkitEditor'):
+			if not area:
+				continue
+			for comp in area.findChildren(name='shaderLibraries'):
+				for dat in comp.findChildren(type=DAT, depth=1):
+					if dat.par['syncfile'] or dat.par['loadonstartpulse'] is None:
+						continue
+					dat.par.loadonstartpulse.pulse()

docs/_data/toolkit.yaml

@@ -1 +1 @@
-toolkitVersion: '0.40'
+toolkitVersion: '0.41'

docs/_layouts/operatorCategory.html

@@ -17,19 +17,27 @@
 
 <h2>Operators</h2>
 
-<ul class="category-ops">
+<table class="category-op-table">
 	{% for op in page.cat.operators %}
-	<li>
-		{% if op.thumb %}
-		<img class="thumb" src="/raytk/{{ op.thumb }}" alt="{{ op.name }}">
-		{% endif %}
-		<code class="op-name">
-			<a href="/raytk/reference/operators/{{page.cat.name}}/{{op.name}}" title="{{ op.name }}">{{ op.name }}</a>
-		</code>:
-		{% if op.status %}
-			<span class="label status-{{ op.status }}">{{ op.status }}</span>
-		{% endif %}
-		<span class="op-desc">{{ op.summary }}</span>
-	</li>
+		<tr>
+			<td class="cat-op-img-cell">
+				{% if op.thumb %}
+					<img class="thumb" src="/raytk/{{ op.thumb }}" alt="{{ op.name }}">
+				{% else %}
+					<span class="thumb-placeholder"> </span>
+				{% endif %}
+			</td>
+			<td class="cat-op-name-cell">
+				<code class="op-name">
+					<a href="/raytk/reference/operators/{{page.cat.name}}/{{op.name}}" title="{{ op.name }}">{{ op.name }}</a>
+				</code>
+				{% if op.status %}
+					<span class="label status-{{ op.status }}">{{ op.status }}</span>
+				{% endif %}
+			</td>
+			<td class="cat-op-desc-cell">
+				<span class="op-desc">{{ op.summary }}</span>
+			</td>
+		</tr>
 	{% endfor %}
-</ul>
+</table>

docs/_reference/operators/camera/index.md

@@ -33,6 +33,7 @@ cat:
     name: fisheyeCamera
     summary: A 360 fisheye camera, that shows all directions from a specific point
       in space.
+    thumb: assets/images/reference/operators/camera/fisheyeCamera_thumb.png
   - name: linkedCamera
     summary: A camera that is linked to an existing TD Camera COMP.
   - name: lookAtCamera
@@ -46,6 +47,7 @@ cat:
   - name: splitCamera
     summary: A camera that splits the viewport into several zones, each using a separate
       camera.
+    thumb: assets/images/reference/operators/camera/splitCamera_thumb.png
   summary: 'Operators that are used in raymarching to determine which
 
     direction rays should travel, effectively behaving as cameras.'

docs/_reference/operators/combine/index.md

@@ -16,6 +16,7 @@ cat:
     summary: Adds the values of multiple fields.
   - name: arrange
     summary: Combines multiple SDFs, with a different position for each.
+    thumb: assets/images/reference/operators/combine/arrange_thumb.png
   - name: boundLimit
     status: beta
   - keywords:
@@ -27,6 +28,7 @@ cat:
     shortcuts:
     - cmb
     summary: Combines SDFs in various ways.
+    thumb: assets/images/reference/operators/combine/combine_thumb.png
   - name: combineFields
     summary: Combines float or vector fields using one of several mathematical operations.
   - name: composeSdf
@@ -35,31 +37,43 @@ cat:
       SDF.
   - name: compositeFields
     summary: Combines two vector fields using color compositing.
+    thumb: assets/images/reference/operators/combine/compositeFields_thumb.png
   - name: edgeCombine
     summary: Combines two SDFs in ways that use the intersection areas.
+    thumb: assets/images/reference/operators/combine/edgeCombine_thumb.png
   - name: iterationSwitch
     summary: Switches between inputs based on the iteration value provided by a downstream
       operator.
+    thumb: assets/images/reference/operators/combine/iterationSwitch_thumb.png
   - name: layoutGrid
     summary: Slices space into a grid, and places each input in a separate cell.
+    thumb: assets/images/reference/operators/combine/layoutGrid_thumb.png
   - name: mergeFields
     summary: Merges multiple vector fields, using different fields for each vector
       part.
+  - name: mixFields
+    status: beta
   - name: shapedCombine
     summary: Combine two SDFs, using a 2D SDF to shape the blending region.
   - name: simpleDiff
+    status: deprecated
     summary: Combines two SDFs using the difference operator.
+    thumb: assets/images/reference/operators/combine/simpleDiff_thumb.png
   - name: simpleIntersect
+    status: deprecated
     summary: Combines SDFs using the intersect operator.
+    thumb: assets/images/reference/operators/combine/simpleIntersect_thumb.png
   - name: simpleUnion
     shortcuts:
     - su
+    status: deprecated
     summary: Combines several SDFs using the union operator.
+    thumb: assets/images/reference/operators/combine/simpleUnion_thumb.png
   - keywords:
     - blend
     name: switch
-    summary: Switches between several inputs, without the need to rebuild the shader,
-      allowing for fast switching.
+    summary: Switches or blends between several inputs, without the need to rebuild
+      the shader, allowing for fast switching.
   - name: triPlanarCombine
     status: beta
     summary: Combines three 2D fields based on vectors like surface normals.