--- ray/test/renders/Makefile	2021/01/01 20:15:35	1.28
+++ ray/test/renders/Makefile	2023/11/17 21:22:27	1.36
@@ -1,4 +1,4 @@
-# RCSid $Id: Makefile,v 1.28 2021/01/01 20:15:35 greg Exp $
+# RCSid $Id: Makefile,v 1.36 2023/11/17 21:22:27 greg Exp $
 #
 # Render and primitive type testing
 #
@@ -14,23 +14,40 @@ endif
 RDU_PFILT = pfilt -1 -r 1 -x 128 -y 128 -pa 1
 
 # Image comparison command
-IMG_CMP = radcompare -rms 0.08 -max 1.5
+IMG_CMP = radcompare -rel 0.007 -rms 0.1 -max 1.5
 
 # Default target is to test everything
 all:	test-xform test-oconv test-rad test-rfluxmtx test-rpiece \
 test-rpict test-mkpmap \
+test-trans2-def test-trans2-fish test-trans2-win \
 test-mixtex-def test-mixtex-fish test-mixtex-plan test-mixtex-rplan \
-test-trans2-def test-trans2-fish test-dielectric-def \
-test-dielectric-fish test-glass-def test-glass-fish test-glass-up \
 test-tfunc-def test-tfunc-fish test-inst-def test-inst-fish \
-test-mesh-def test-mesh-cyl test-mirror-fish test-mist-def \
-test-trans-def test-trans-fish test-patterns-def test-patterns-plan \
-test-rtrace test-obj2mesh
+test-mesh-def test-mesh-cyl test-mesh-cyl2 test-mist-def \
+test-dielectric-def test-dielectric-fish test-trans-def \
+test-glass-def test-glass-fish test-glass-up \
+test-trans-fish test-patterns-def test-patterns-plan \
+test-rtrace test-mirror-fish test-obj2mesh \
+test-prism1-fish test-prism2-fish test-spectra-fish
 
 clean:
 	rm -f *.oct *.amb *_ill.dat blinds_ill?.dat *_*.hdr *.unf \
 *.[cg]pm{,.leaf} inst_rad.txt combined.rad rfmirror.mtx
 
+######
+# More-or-less evenly divided batches for NPROC=1 (redundancies removed)
+
+batch1:	test-mixtex-def test-mixtex-fish test-mixtex-plan test-mixtex-rplan \
+test-xform test-oconv test-rad test-obj2mesh
+
+batch2:	test-rfluxmtx test-mist-def test-glass-def test-glass-fish test-glass-up
+
+batch3:	test-inst-def test-inst-fish test-trans2-def test-trans2-fish test-trans2-win \
+test-dielectric-def test-dielectric-fish
+
+batch4:	test-rtrace test-prism1-fish test-prism2-fish test-mirror-fish \
+test-mesh-def test-mesh-cyl test-mesh-cyl2 test-tfunc-def test-tfunc-fish \
+test-trans-def test-trans-fish test-patterns-def test-patterns-plan 
+
 ### Test Aliases ###
 
 test-rpict:	test-mirror-fish
@@ -61,13 +78,13 @@ test-obj2mesh:	cab.obj
 
 ### Special test of rtrace ###
 
-test-rtrace:	ref/mirror_fish.hdr  rtmirror_fish.hdr
+test-rtrace:	ref/mirror_fish.hdr rtmirror_fish.hdr
 	$(RDU_PFILT) rtmirror_fish.hdr | $(IMG_CMP) -h ref/mirror_fish.hdr -
 
 rtmirror_fish.hdr:	mirror.oct
 	rad -v 0 mirror.rif OPT=mirror.opt 
-	vwrays -ff -vf fish.vf -x 2048 -y 2048 | rtrace -n $(NPROC) @mirror.opt \
--ffc -x 2048 -y 2048 mirror.oct | pfilt -1 -e +3 -r .6 -x /2 -y /2 \
+	vwrays -ff -vf fish.vf -x 2048 -y 1991 | rtrace -n $(NPROC) @mirror.opt \
+-ffc -x 2048 -y 1991 mirror.oct | pfilt -1 -e +3 -r .6 -x /2 -y /2 \
 > rtmirror_fish.hdr
 	rm -f mirror.opt
 
@@ -519,3 +536,17 @@ mixtex_rplan.hdr:	mixtex.oct
 	rad -v rplan  mixtex.rif
 
 ### End  mixtex-rplan tests
+
+### Reference and test for spectra fish ###
+
+test-spectra-fish:	ref/spectra_fish.hdr spectra_fish.hdr
+	$(RDU_PFILT) spectra_fish.hdr | $(IMG_CMP) ref/spectra_fish.hdr -
+
+ref/spectra_fish.hdr:
+	make spectra_fish.hdr
+	$(RDU_PFILT) spectra_fish.hdr > ref/spectra_fish.hdr
+
+spectra_fish.hdr:	spectra.oct
+	rad -v fish spectra.rif
+
+### End spectra-fish tests