--- ray/test/renders/Makefile	2019/01/04 22:45:37	1.15
+++ ray/test/renders/Makefile	2020/06/30 18:51:30	1.22
@@ -1,8 +1,11 @@
-# RCSid $Id: Makefile,v 1.15 2019/01/04 22:45:37 greg Exp $
+# RCSid $Id: Makefile,v 1.22 2020/06/30 18:51:30 greg Exp $
 #
 # Render and primitive type testing
 #
 
+# Number of processes to use on tests that run multi-core
+NPROC = 2
+
 # Image reduction for comparisons
 RDU_PFILT = pfilt -1 -r 1 -x 128 -y 128 -pa 1
 
@@ -10,25 +13,48 @@ 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-rpiece \
+test-rpict test-mkpmap \
 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-rtrace test-obj2mesh
 
 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
 
+### Test Aliases ###
+
+test-rpict:	test-mirror-fish
+
+test-rpiece test-mkpmap:	test-mixtex-def
+
 ### Special test of xform ###
 
-test-xform:	combined_scene.rad
-	xform -f combined_scene.rad | grep -v '^[ 	]*#' > combined.rad
+test-xform:	combined.rad
 	radcompare -max 0.04 ref/combined.rad combined.rad
 
+combined.rad:	combined_scene.rad
+	xform -f combined_scene.rad | grep -v '^[ 	]*#' > 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 tests of oconv and obj2mesh ###
+
+test-oconv:	inst.oct
+	radcompare ref/inst.oct inst.oct
+
+test-obj2mesh:	cab.obj
+	obj2mesh -w cab.obj | radcompare ref/cab.rtm -
+
 ### Special test of rtrace ###
 
 test-rtrace:	ref/mirror_fish.hdr  rtmirror_fish.hdr
@@ -36,7 +62,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
@@ -44,13 +70,13 @@ rtmirror_fish.hdr:	mirror.oct
 ### Special test for rfluxmtx (and rcontrib) ###
 
 test-rfluxmtx:	ref/rfmirror.mtx rfmirror.mtx
-	radcompare -max .4 -rms .05 ref/rfmirror.mtx rfmirror.mtx
+	radcompare -max .4 -rms .05 -rel 1e-4 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 ###
 
@@ -231,11 +257,6 @@ mirror_fish.hdr:	mirror.oct
 
 ### End  mirror-fish  tests
 
-### Octree for    mist ###
-
-mist.oct:	mist.rif
-	rad -v 0    mist.rif
-
 ### Reference and test for    mist view   def ###
 
 test-mist-def:	ref/mist_def.hdr    mist_def.hdr
@@ -245,8 +266,8 @@ ref/mist_def.hdr:
 	make    mist_def.hdr
 	$(RDU_PFILT)    mist_def.hdr > ref/mist_def.hdr
 
-mist_def.hdr:	mist.oct
-	rad -v   def    mist.rif
+mist_def.hdr:	mist.rif
+	rad -N $(NPROC) mist.rif
 
 ### End    mist-def   tests
 
@@ -437,7 +458,7 @@ patterns_plan.hdr:	patterns.oct
 ### Octree for  mixtex ###
 
 mixtex.oct:	mixtex.rif
-	rad -v 0  mixtex.rif
+	rad -v 0 -N $(NPROC) mixtex.rif
 
 ### Reference and test for  mixtex view   def ###
 
@@ -449,7 +470,7 @@ ref/mixtex_def.hdr:
 	$(RDU_PFILT)  mixtex_def.hdr > ref/mixtex_def.hdr
 
 mixtex_def.hdr:	mixtex.oct
-	rad -v   def  mixtex.rif
+	rad -v def -N $(NPROC) mixtex.rif
 
 ### End  mixtex-def   tests