--- ray/test/renders/Makefile	2019/01/04 22:45:37	1.15
+++ ray/test/renders/Makefile	2019/01/07 21:11:24	1.17
@@ -1,8 +1,11 @@
-# RCSid $Id: Makefile,v 1.15 2019/01/04 22:45:37 greg Exp $
+# RCSid $Id: Makefile,v 1.17 2019/01/07 21:11:24 greg Exp $
 #
 # Render and primitive type testing
 #
 
+# Number of processes to use on tests that test multi-core
+NPROC = 2
+
 # Image reduction for comparisons
 RDU_PFILT = pfilt -1 -r 1 -x 128 -y 128 -pa 1
 
@@ -10,7 +13,7 @@ RDU_PFILT = pfilt -1 -r 1 -x 128 -y 128 -pa 1
 IMG_CMP = radcompare -rms 0.07 -max 1.5
 
 # Default target is to test everything
-all:	test-xform test-rfluxmtx \
+all:	test-xform test-oconv test-rad test-rfluxmtx \
 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 \
@@ -21,7 +24,7 @@ test-rtrace
 
 clean:
 	rm -f *.oct *.amb *_ill.dat blinds_ill?.dat *_*.hdr *.unf \
-*.[cg]pm{,.leaf} combined.rad rfmirror.mtx
+*.[cg]pm{,.leaf} inst_rad.txt combined.rad rfmirror.mtx
 
 ### Special test of xform ###
 
@@ -29,6 +32,17 @@ test-xform:	combined_scene.rad
 	xform -f combined_scene.rad | grep -v '^[ 	]*#' > combined.rad
 	radcompare -max 0.04 ref/combined.rad combined.rad
 
+### Special test of rad ###
+
+test-rad:	inst.rif
+	rad -n -s -e inst.rif > inst_rad.txt
+	radcompare ref/inst_rad.txt inst_rad.txt
+
+### Special test of oconv ###
+
+test-oconv:	inst.oct
+	radcompare ref/inst.oct inst.oct
+
 ### Special test of rtrace ###
 
 test-rtrace:	ref/mirror_fish.hdr  rtmirror_fish.hdr
@@ -36,7 +50,7 @@ test-rtrace:	ref/mirror_fish.hdr  rtmirror_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 2 @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 \
 > rtmirror_fish.hdr
 	rm -f mirror.opt
@@ -48,9 +62,9 @@ test-rfluxmtx:	ref/rfmirror.mtx rfmirror.mtx
 
 rfmirror.mtx:	mirror.rad dummysky.rad basic.mat diorama_walls.rad \
 closed_end.rad front_cap.rad glass_pane.rad antimatter_portal.rad
-	rfluxmtx -ab 2 -lw 1e-4 mirror.rad dummysky.rad basic.mat \
-diorama_walls.rad closed_end.rad front_cap.rad glass_pane.rad \
-antimatter_portal.rad > rfmirror.mtx
+	rfluxmtx -n $(NPROC) -ab 2 -lw 1e-4 mirror.rad dummysky.rad \
+basic.mat diorama_walls.rad closed_end.rad front_cap.rad \
+glass_pane.rad antimatter_portal.rad > rfmirror.mtx
 
 ### Octree for dielectric ###