Merge pull request #1188 from t3kt/0.39

0.39

devel/prototypes/fractalQube.glsl

@@ -0,0 +1,58 @@
+// @Scale {"default":1, "normMin":0, "normMax":2}
+// @Offset {"style": "XYZ"}
+// @Offset2 {"style": "XYZ"}
+// @Rot {"style": "XYZ"}
+// @Qube {"default":1, "normMin":0, "normMax":2}
+// @Iterations {"style": "Int", "default":1, "normMin":0, "normMax":10}
+
+///////////////////////////////////////////////////////////////////////////////////////
+// Fractal Qube Ported from Fragmentarium 'BioCube' example by Darkbeam
+///////////////////////////////////////////////////////////////////////////////////////
+
+float fFractalQube(vec3 p, float Scale, vec3 Offset, vec3 Offset2, vec3 Rot, float Qube, int Iterations)
+{
+	mat3 fracRotation1 = Scale * rotateMatrix(Rot);
+	float t;
+	int n = 0;
+	float scalep = 1;
+	vec3 z0 = p;
+	p = abs(p);
+	//z -= (1,1,1);
+	if (p.y>p.x) p.xy = p.yx;
+	if (p.z>p.x) p.xz = p.zx;
+	if (p.y>p.x) p.xy = p.yx;
+	float d = 1.0- p.x;
+	p = z0;
+	// Folds.
+	//Dodecahedral
+	while (n < Iterations)
+	{
+		p *= fracRotation1;
+		p = abs(p);
+		p -= Offset;
+		if (p.y>p.x) p.xy = p.yx;
+		if (p.z>p.x) p.xz = p.zx;
+		if (p.y>p.x) p.xy = p.yx;
+		p -= Offset2;
+		if (p.y>p.x) p.xy = p.yx;
+		if (p.z>p.x) p.xz = p.zx;
+		if (p.y>p.x) p.xy = p.yx;
+
+		n++;  scalep *= Scale;
+		d = abs(min(Qube/n-d, (+p.x)/scalep));
+	}
+	return d;
+}
+
+
+ReturnT thismap(CoordT p, ContextT ctx) {
+	float scale = THIS_Scale;
+	vec3 offset = THIS_Offset;
+	vec3 offset2 = THIS_Offset2;
+	vec3 rot = radians(THIS_Rot);
+	float qube = THIS_Qube;
+	int iterations = int(THIS_Iterations);
+
+	float d = fFractalQube(p, scale, offset, offset2, rot, qube, iterations);
+	return createSdf(d);
+}

devel/toolkitEditor/testEditor/testEditor.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 from raytkUtil import showPromptDialog, navigateTo
 from raytkTest import processTest
+from typing import Callable
 
 # noinspection PyUnreachableCode
 if False:
@@ -97,6 +98,7 @@ def _loadTest(self, name: str, toxPath: Path):
 		self._reloadOutputsSoon()
 		self._refreshFindings()
 		self._loadOutputSnapshot()
+		queueCall(self.processTest, delayFrames=30)
 
 	def createTest(self):
 		self._create('test')
@@ -198,3 +200,7 @@ def saveOutputSnapshot(self):
 		image = tox.replace('.tox', '.png')
 		top.save(image)
 		self._loadOutputSnapshot()
+
+
+def queueCall(action: Callable, delayFrames=10, *args):
+	run('args[0](*(args[1:]))', action, *args, delayFrames=delayFrames, delayRef=root)

docs/_data/toolkit.yaml

@@ -1 +1 @@
-toolkitVersion: '0.38'
+toolkitVersion: '0.39'

docs/_includes/paramHandling.html

@@ -1,8 +1,8 @@
 {% case include.handling %}
 	{% when "runtime" %}
 		<span title="Can change efficiently">Runtime</span>
-	{% when "macro" %}
+	{% when "baked" %}
 		<span title="Causes a recompile when changed">Baked</span>
-	{% when "constant" %}
+	{% when "semibaked" %}
 		<span title="Might cause a partial recompile when changed">Semi-Baked</span>
 {% endcase %}

docs/_layouts/operator.html

@@ -153,6 +153,22 @@ <h2>Inputs</h2>
 							<span class="input-types-item"><code>{{t}}</code></span>
 						{% endfor %}
 					</li>
+					{% if input.supportedVariables %}
+					<li>
+						<em>Supports Variables:</em>
+						{% for v in input.supportedVariables %}
+							<span class="input-types-item"><code>{{v}}</code></span>
+						{% endfor %}
+					</li>
+					{% endif %}
+					{% if input.supportedVariableInputs %}
+					<li>
+						<em>Supports Variables From Inputs:</em>
+						{% for v in input.supportedVariableInputs %}
+							<span class="input-types-item"><code>{{v}}</code></span>
+						{% endfor %}
+					</li>
+					{% endif %}
 				</ul>
 			</li>
 		{% endfor %}

docs/_reference/operators/camera/basicCamera.md

@@ -13,17 +13,17 @@ op:
   parameters:
   - label: FOV Angle
     name: Camfov
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Width of the view angle.
   - label: Position
     name: Campos
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Position of the camera.
   - label: Rotate
     name: Camrot
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Rotation of the camera view direction.
   summary: Standard camera equivalent to a traditional Camera COMP with default settings.

docs/_reference/operators/camera/fieldCamera.md

@@ -31,7 +31,7 @@ op:
   parameters:
   - label: Position
     name: Campos
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Position of the camera.
   status: beta

docs/_reference/operators/camera/fisheyeCamera.md

@@ -32,32 +32,34 @@ op:
     - label: Orthographic Fisheye
       name: orthographicfisheye
     name: Fisheyemode
+    readOnlyHandling: baked
+    regularHandling: runtime
   - label: Aperture
     name: Aperture
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
   - label: Position
     name: Campos
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Position of the camera.
   - label: Rotate
     name: Camrot
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Rotates the camera in XYZ.
   - label: Look At Position
     name: Lookatpos
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Coordinates that the camera should face.
   - label: Up Vector
     name: Camup
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
   - label: Enable Look At
     name: Enablelookat
-    readOnlyHandling: constant
+    readOnlyHandling: semibaked
     regularHandling: runtime
   summary: A 360 fisheye camera, that shows all directions from a specific point in
     space.

docs/_reference/operators/camera/lookAtCamera.md

@@ -13,27 +13,27 @@ op:
   parameters:
   - label: FOV Angle
     name: Camfov
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: FOV angle.
   - label: Position
     name: Campos
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Position of the camera.
   - label: Rotate
     name: Camrot
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Rotation of the camera in XYZ.
   - label: Look At Position
     name: Lookatpos
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Position that the camera faces.
   - label: Up Vector
     name: Camup
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Up vector (used to interpret the `Lookatpos`).
   shortcuts:

docs/_reference/operators/camera/orthoCamera.md

@@ -26,15 +26,17 @@ op:
     - label: Front (Z-)
       name: zneg
     name: Direction
+    readOnlyHandling: baked
+    regularHandling: runtime
     summary: Direction that the camera faces.
   - label: Position
     name: Campos
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Position of the camera.
   - label: Rotate
     name: Rotate
-    readOnlyHandling: macro
+    readOnlyHandling: baked
     regularHandling: runtime
     summary: Rotation of the camera view on the axis facing the camera.
   status: beta

docs/_reference/operators/camera/splitCamera.md

@@ -65,13 +65,13 @@ op:
       label: Grid
       name: grid
     name: Layout
-    readOnlyHandling: macro
-    regularHandling: macro
+    readOnlyHandling: baked
+    regularHandling: baked
     summary: How to arrange the zones.
   - label: Rescale
     name: Rescale
-    readOnlyHandling: macro
-    regularHandling: macro
+    readOnlyHandling: baked
+    regularHandling: baked
     summary: Whether to rescale each camera to fit each zone. When switched off, if
       using a grid, you will only see the top right corner of the first camera, the
       top left of the second, etc. When switched on, you see the full view that each

docs/_reference/operators/combine/addFields.md

@@ -49,6 +49,8 @@ op:
     returnTypes:
     - float
     - vec4
+    supportedVariableInputs:
+    - inputOp1
   - contextTypes:
     - Context
     - MaterialContext
@@ -68,6 +70,8 @@ op:
     returnTypes:
     - float
     - vec4
+    supportedVariableInputs:
+    - inputOp[1-2]
   - contextTypes:
     - Context
     - MaterialContext
@@ -87,6 +91,8 @@ op:
     returnTypes:
     - float
     - vec4
+    supportedVariableInputs:
+    - inputOp[1-3]
   - contextTypes:
     - Context
     - MaterialContext
@@ -106,6 +112,8 @@ op:
     returnTypes:
     - float
     - vec4
+    supportedVariableInputs:
+    - inputOp[1-4]
   - contextTypes:
     - Context
     - MaterialContext
@@ -125,6 +133,8 @@ op:
     returnTypes:
     - float
     - vec4
+    supportedVariableInputs:
+    - inputOp[1-5]
   - contextTypes:
     - Context
     - MaterialContext
@@ -144,6 +154,8 @@ op:
     returnTypes:
     - float
     - vec4
+    supportedVariableInputs:
+    - inputOp[1-6]
   - contextTypes:
     - Context
     - MaterialContext
@@ -163,6 +175,8 @@ op:
     returnTypes:
     - float
     - vec4
+    supportedVariableInputs:
+    - inputOp[1-7]
   name: addFields
   opType: raytk.operators.combine.addFields
   summary: Adds the values of multiple fields.