--- branches/pure-cfg/test/vr-curv-quad.diderot	2011/06/24 14:26:11	1385
+++ branches/pure-cfg/test/vr-curv-quad.diderot	2011/06/24 14:44:35	1386
@@ -1,9 +1,9 @@
-// vr-curv
+// vr-curv-quad
 //
 // Demonstration of curvature-based transfer functions in volume rendering
 //
 // process output with:
-// unu reshape -i mip.txt -s 4 480 345 | overrgb -i - -b 0.1 0.15 0.2 -g 1.2 -o - | unu quantize -b 8 -min 0 -max 255  -o vr-curv-quad.png
+// unu reshape -i vr-curv-quad.txt -s 4 480 345 | overrgb -i - -b 0.1 0.15 0.2 -g 1.2 -o - | unu quantize -b 8 -min 0 -max 255  -o vr-curv-quad.png
 
 field#2(3)[] F = bspln3 ⊛ load("../data/quad-patches-pad.nrrd");
 field#0(2)[3] RGB = tent ⊛ load("../data/txf/2d-bow.nrrd");
@@ -59,7 +59,7 @@
               vec3 grad = -∇F(pos);
               vec3 norm = normalize(grad);
               // begin curvature computation
-              tensor[3,3] H = ∇(∇F)(pos);
+              tensor[3,3] H = ∇⊗∇F(pos);
               tensor[3,3] P = identity[3] - norm⊗norm;
               tensor[3,3] G = -(P•H•P)/|grad|;
               real disc = max(0.0, sqrt(2.0*|G|^2 - trace(G)^2));

<script type="text/javascript">//<![CDATA[
		function toggle_ffErrors() {
			var errorsblock = document.getElementById("ffErrorsBlock");
			var errorsgroup = document.getElementById("ffErrors");
			if (errorsblock.style.display == "none") {
				errorsblock.style.display = "block";
				errorsgroup.style.right = "10px";
			} else {
				errorsblock.style.display = "none";
				errorsgroup.style.right = "300px";
			}
		}
//]]></script>
<div id="ffErrors">
<a href="javascript:toggle_ffErrors();">Click to toggle</a>
<div id="ffErrorsBlock">
	<div class="error">does not end with &lt;/html&gt; tag</div>
	<div class="error">does not end with &lt;/body&gt; tag</div>
	<div class="info">The output has ended thus: sor[3,3] G = -(P&bull;H&bull;P)/|grad|;
               real disc = max(0.0, sqrt(2.0*|G|^2 - trace(G)^2));</div>
</div></div>
</body></html>