test: Improved test for new WGMDfunc material

LBNL-ETA · Dec 9, 2024 · c6e9de2 · c6e9de2
1 parent 1744eae
commit c6e9de2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/test/renders/gymbal2.rad b/test/renders/gymbal2.rad
@@ -1,4 +1,4 @@
-# RCSid $Id: gymbal2.rad,v 1.1 2024/12/09 00:44:29 greg Exp $
+# RCSid $Id: gymbal2.rad,v 1.2 2024/12/09 03:10:36 greg Exp $
 #
 # Tests of WGMDfunc material
 #
@@ -10,56 +10,56 @@ void colorfunc check1
 0
 
 void WGMDfunc wgmd_mat1
-15
-	void .08 if(Check(8),.005,.07) if(Check(8),.07,.005)
+19
+	void if(Px,.08,0) 0 0
 	check1 .2 0 0
 	void
 	0 0 1
-	cylmods.cal -ry 90
+	cylmods.cal -ry 90 -t -4 2.5 1.1
 0
 9
-	.05	.01	.05
+	.01	.01	.01
 	.05	.2	.05
 	0	0	0
 
 void texfunc pyramid2
-8 Pyramid_dx(13) Pyramid_dy(13) Pyramid_dz(13)
-	cylmods.cal -s .9 -rx 90
+12 Pyramid_dx(13) Pyramid_dy(13) Pyramid_dz(13)
+	cylmods.cal -s .9 -rx 90 -t -4 2.5 1.1
 0
 0
 
 void colorfunc check2
-8 if(Check(9),.9,.1) .1 if(Check(9),.3,.1)
-	cylmods.cal -s .9 -rx 90
+12 if(Check(9),.9,.1) .1 if(Check(9),.3,.1)
+	cylmods.cal -s .9 -rx 90 -t -4 2.5 1.1
 0
 0
 
 void WGMDfunc wgmd_mat2
-13
+17
 	pyramid2 .08 0 0
 	check2 .2 .02 .02
 	void
 	0 0 0
-	.
+	. -t -4 2.5 1.1
 0
 9
 	0 0 0
 	0 0 0
 	0 0 0
 
 void colorfunc check3
-6 if(Check(7),.9,.1) .1 if(Check(7),.3,.1)
-	cylmods.cal -s .8
+10 if(Check(7),.9,.1) .1 if(Check(7),.3,.1)
+	cylmods.cal -s .8 -t -4 2.5 1.1
 0
 0
 
 check3 WGMDfunc wgmd_mat3
-13
-	void .03 .08 .03
+17
+	void .03 .08*max(Pz,0) .03*max(Pz,0)
 	void 0 0 0
 	inherit
 	0 0 1
-	.
+	. -t -4 2.5 1.1
 0
 9
 	0 0 0

diff --git a/test/renders/ref/wgmdf_def.hdr b/test/renders/ref/wgmdf_def.hdr
diff --git a/test/renders/wgmdf.rif b/test/renders/wgmdf.rif
@@ -1,4 +1,4 @@
-# RCSid $Id: wgmdf.rif,v 1.1 2024/12/09 00:44:29 greg Exp $
+# RCSid $Id: wgmdf.rif,v 1.2 2024/12/09 03:10:36 greg Exp $
 #
 # Test of WGMDfunc material
 #
@@ -22,7 +22,7 @@ VAR = High
 DET = High
 PEN = False
 
-render = @render.opt
+render = @render.opt -lw 1e-6 -lr -8 -ad 3000
 
 view= def -vp -2.60899 4.62728 2.52391 -vd -1.11057 -1.64932 -1.10768 \
 	-vh 46.6777 -vv 46.6777