--- ray/test/renders/Makefile 2019/01/04 18:52:06 1.14 +++ ray/test/renders/Makefile 2024/01/17 18:57:54 1.39 @@ -1,33 +1,105 @@ -# RCSid $Id: Makefile,v 1.14 2019/01/04 18:52:06 greg Exp $ +# RCSid $Id: Makefile,v 1.39 2024/01/17 18:57:54 greg Exp $ # # Render and primitive type testing # +# Number of processes to use on tests that run multi-core +ifeq ($(OS),Windows_NT) # is Windows + NPROC := 1 +else + NPROC := 2 +endif + # Image reduction for comparisons RDU_PFILT = pfilt -1 -r 1 -x 128 -y 128 -pa 1 # Image comparison command -IMG_CMP = radcompare -rms 0.07 -max 1.5 +IMG_CMP = radcompare -rel 0.007 -rms 0.1 -max 1.5 # Default target is to test everything -all: test-xform \ +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-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} combined.rad +*.[cg]pm{,.leaf} inst_rad.txt combined.rad rfmirror.mtx -# Special test of xform +###### +# More-or-less evenly divided batches for NPROC=1 (redundancies removed) -test-xform: combined_scene.rad - xform -f combined_scene.rad | grep -v '^[ ]*#' > combined.rad - radcompare -max 0.04 ref/combined.rad combined.rad +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 \ +test-spectra-fish + +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 + +test-rpiece test-mkpmap: test-mixtex-def + +### Special test of xform ### + +test-xform: combined.rad + radcompare "-c#" -max 0.04 ref/combined.rad combined.rad + +combined.rad: combined_scene.rad + xform -f combined_scene.rad > combined.rad + +### Special test of rad ### + +test-rad: inst.oct + 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 + $(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 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 + +### Special test for rfluxmtx (and rcontrib) ### + +test-rfluxmtx: 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 -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 ### dielectric.oct: dielectric.rif @@ -38,8 +110,7 @@ dielectric.oct: dielectric.rif test-dielectric-def: ref/dielectric_def.hdr dielectric_def.hdr $(RDU_PFILT) dielectric_def.hdr | $(IMG_CMP) ref/dielectric_def.hdr - -ref/dielectric_def.hdr: - make dielectric_def.hdr +ref/dielectric_def.hdr: dielectric_def.hdr $(RDU_PFILT) dielectric_def.hdr > ref/dielectric_def.hdr dielectric_def.hdr: dielectric.oct @@ -52,8 +123,7 @@ dielectric_def.hdr: dielectric.oct test-dielectric-fish: ref/dielectric_fish.hdr dielectric_fish.hdr $(RDU_PFILT) dielectric_fish.hdr | $(IMG_CMP) ref/dielectric_fish.hdr - -ref/dielectric_fish.hdr: - make dielectric_fish.hdr +ref/dielectric_fish.hdr: dielectric_fish.hdr $(RDU_PFILT) dielectric_fish.hdr > ref/dielectric_fish.hdr dielectric_fish.hdr: dielectric.oct @@ -71,8 +141,7 @@ glass.oct: glass.rif test-glass-def: ref/glass_def.hdr glass_def.hdr $(RDU_PFILT) glass_def.hdr | $(IMG_CMP) ref/glass_def.hdr - -ref/glass_def.hdr: - make glass_def.hdr +ref/glass_def.hdr: glass_def.hdr $(RDU_PFILT) glass_def.hdr > ref/glass_def.hdr glass_def.hdr: glass.oct @@ -85,8 +154,7 @@ glass_def.hdr: glass.oct test-glass-fish: ref/glass_fish.hdr glass_fish.hdr $(RDU_PFILT) glass_fish.hdr | $(IMG_CMP) ref/glass_fish.hdr - -ref/glass_fish.hdr: - make glass_fish.hdr +ref/glass_fish.hdr: glass_fish.hdr $(RDU_PFILT) glass_fish.hdr > ref/glass_fish.hdr glass_fish.hdr: glass.oct @@ -99,8 +167,7 @@ glass_fish.hdr: glass.oct test-glass-up: ref/glass_up.hdr glass_up.hdr $(RDU_PFILT) glass_up.hdr | $(IMG_CMP) ref/glass_up.hdr - -ref/glass_up.hdr: - make glass_up.hdr +ref/glass_up.hdr: glass_up.hdr $(RDU_PFILT) glass_up.hdr > ref/glass_up.hdr glass_up.hdr: glass.oct @@ -118,8 +185,7 @@ inst.oct: inst.rif test-inst-def: ref/inst_def.hdr inst_def.hdr $(RDU_PFILT) inst_def.hdr | $(IMG_CMP) ref/inst_def.hdr - -ref/inst_def.hdr: - make inst_def.hdr +ref/inst_def.hdr: inst_def.hdr $(RDU_PFILT) inst_def.hdr > ref/inst_def.hdr inst_def.hdr: inst.oct @@ -132,8 +198,7 @@ inst_def.hdr: inst.oct test-inst-fish: ref/inst_fish.hdr inst_fish.hdr $(RDU_PFILT) inst_fish.hdr | $(IMG_CMP) ref/inst_fish.hdr - -ref/inst_fish.hdr: - make inst_fish.hdr +ref/inst_fish.hdr: inst_fish.hdr $(RDU_PFILT) inst_fish.hdr > ref/inst_fish.hdr inst_fish.hdr: inst.oct @@ -151,8 +216,7 @@ mesh.oct: mesh.rif test-mesh-def: ref/mesh_def.hdr mesh_def.hdr $(RDU_PFILT) mesh_def.hdr | $(IMG_CMP) ref/mesh_def.hdr - -ref/mesh_def.hdr: - make mesh_def.hdr +ref/mesh_def.hdr: mesh_def.hdr $(RDU_PFILT) mesh_def.hdr > ref/mesh_def.hdr mesh_def.hdr: mesh.oct @@ -165,8 +229,7 @@ mesh_def.hdr: mesh.oct test-mesh-cyl: ref/mesh_cyl.hdr mesh_cyl.hdr $(RDU_PFILT) mesh_cyl.hdr | $(IMG_CMP) ref/mesh_cyl.hdr - -ref/mesh_cyl.hdr: - make mesh_cyl.hdr +ref/mesh_cyl.hdr: mesh_cyl.hdr $(RDU_PFILT) mesh_cyl.hdr > ref/mesh_cyl.hdr mesh_cyl.hdr: mesh.oct @@ -179,8 +242,7 @@ mesh_cyl.hdr: mesh.oct test-mesh-cyl2: ref/mesh_cyl2.hdr mesh_cyl2.hdr $(RDU_PFILT) mesh_cyl2.hdr | $(IMG_CMP) ref/mesh_cyl2.hdr - -ref/mesh_cyl2.hdr: - make mesh_cyl2.hdr +ref/mesh_cyl2.hdr: mesh_cyl2.hdr $(RDU_PFILT) mesh_cyl2.hdr > ref/mesh_cyl2.hdr mesh_cyl2.hdr: mesh.oct @@ -198,8 +260,7 @@ mirror.oct: mirror.rif test-mirror-fish: ref/mirror_fish.hdr mirror_fish.hdr $(RDU_PFILT) mirror_fish.hdr | $(IMG_CMP) ref/mirror_fish.hdr - -ref/mirror_fish.hdr: - make mirror_fish.hdr +ref/mirror_fish.hdr: mirror_fish.hdr $(RDU_PFILT) mirror_fish.hdr > ref/mirror_fish.hdr mirror_fish.hdr: mirror.oct @@ -207,22 +268,16 @@ 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 $(RDU_PFILT) mist_def.hdr | $(IMG_CMP) ref/mist_def.hdr - -ref/mist_def.hdr: - make mist_def.hdr +ref/mist_def.hdr: 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 @@ -236,8 +291,7 @@ prism1.oct: prism1.rif test-prism1-fish: ref/prism1_fish.hdr prism1_fish.hdr $(RDU_PFILT) prism1_fish.hdr | $(IMG_CMP) ref/prism1_fish.hdr - -ref/prism1_fish.hdr: - make prism1_fish.hdr +ref/prism1_fish.hdr: prism1_fish.hdr $(RDU_PFILT) prism1_fish.hdr > ref/prism1_fish.hdr prism1_fish.hdr: prism1.oct @@ -255,8 +309,7 @@ prism2.oct: prism2.rif test-prism2-fish: ref/prism2_fish.hdr prism2_fish.hdr $(RDU_PFILT) prism2_fish.hdr | $(IMG_CMP) ref/prism2_fish.hdr - -ref/prism2_fish.hdr: - make prism2_fish.hdr +ref/prism2_fish.hdr: prism2_fish.hdr $(RDU_PFILT) prism2_fish.hdr > ref/prism2_fish.hdr prism2_fish.hdr: prism2.oct @@ -266,7 +319,7 @@ prism2_fish.hdr: prism2.oct ### Octree for tfunc ### -tfunc.oct: tfunc.rif +tfunc1.oct: tfunc.rif rad -v 0 tfunc.rif ### Reference and test for tfunc view def ### @@ -274,11 +327,10 @@ tfunc.oct: tfunc.rif test-tfunc-def: ref/tfunc_def.hdr tfunc_def.hdr $(RDU_PFILT) tfunc_def.hdr | $(IMG_CMP) ref/tfunc_def.hdr - -ref/tfunc_def.hdr: - make tfunc_def.hdr +ref/tfunc_def.hdr: tfunc_def.hdr $(RDU_PFILT) tfunc_def.hdr > ref/tfunc_def.hdr -tfunc_def.hdr: tfunc.oct +tfunc_def.hdr: tfunc1.oct rad -v def tfunc.rif ### End tfunc-def tests @@ -288,11 +340,10 @@ tfunc_def.hdr: tfunc.oct test-tfunc-fish: ref/tfunc_fish.hdr tfunc_fish.hdr $(RDU_PFILT) tfunc_fish.hdr | $(IMG_CMP) ref/tfunc_fish.hdr - -ref/tfunc_fish.hdr: - make tfunc_fish.hdr +ref/tfunc_fish.hdr: tfunc_fish.hdr $(RDU_PFILT) tfunc_fish.hdr > ref/tfunc_fish.hdr -tfunc_fish.hdr: tfunc.oct +tfunc_fish.hdr: tfunc1.oct rad -v fish tfunc.rif ### End tfunc-fish tests @@ -307,8 +358,7 @@ trans.oct: trans.rif test-trans-def: ref/trans_def.hdr trans_def.hdr $(RDU_PFILT) trans_def.hdr | $(IMG_CMP) ref/trans_def.hdr - -ref/trans_def.hdr: - make trans_def.hdr +ref/trans_def.hdr: trans_def.hdr $(RDU_PFILT) trans_def.hdr > ref/trans_def.hdr trans_def.hdr: trans.oct @@ -321,8 +371,7 @@ trans_def.hdr: trans.oct test-trans-fish: ref/trans_fish.hdr trans_fish.hdr $(RDU_PFILT) trans_fish.hdr | $(IMG_CMP) ref/trans_fish.hdr - -ref/trans_fish.hdr: - make trans_fish.hdr +ref/trans_fish.hdr: trans_fish.hdr $(RDU_PFILT) trans_fish.hdr > ref/trans_fish.hdr trans_fish.hdr: trans.oct @@ -332,7 +381,7 @@ trans_fish.hdr: trans.oct ### Octree for trans2 ### -trans2.oct: trans2.rif +trans21.oct: trans2.rif rad -v 0 trans2.rif ### Reference and test for trans2 view def ### @@ -340,11 +389,10 @@ trans2.oct: trans2.rif test-trans2-def: ref/trans2_def.hdr trans2_def.hdr $(RDU_PFILT) trans2_def.hdr | $(IMG_CMP) ref/trans2_def.hdr - -ref/trans2_def.hdr: - make trans2_def.hdr +ref/trans2_def.hdr: trans2_def.hdr $(RDU_PFILT) trans2_def.hdr > ref/trans2_def.hdr -trans2_def.hdr: trans2.oct +trans2_def.hdr: trans21.oct rad -v def trans2.rif ### End trans2-def tests @@ -354,11 +402,10 @@ trans2_def.hdr: trans2.oct test-trans2-fish: ref/trans2_fish.hdr trans2_fish.hdr $(RDU_PFILT) trans2_fish.hdr | $(IMG_CMP) ref/trans2_fish.hdr - -ref/trans2_fish.hdr: - make trans2_fish.hdr +ref/trans2_fish.hdr: trans2_fish.hdr $(RDU_PFILT) trans2_fish.hdr > ref/trans2_fish.hdr -trans2_fish.hdr: trans2.oct +trans2_fish.hdr: trans21.oct rad -v fish trans2.rif ### End trans2-fish tests @@ -368,11 +415,10 @@ trans2_fish.hdr: trans2.oct test-trans2-win: ref/trans2_win.hdr trans2_win.hdr $(RDU_PFILT) trans2_win.hdr | $(IMG_CMP) ref/trans2_win.hdr - -ref/trans2_win.hdr: - make trans2_win.hdr +ref/trans2_win.hdr: trans2_win.hdr $(RDU_PFILT) trans2_win.hdr > ref/trans2_win.hdr -trans2_win.hdr: trans2.oct +trans2_win.hdr: trans21.oct rad -v win trans2.rif ### End trans2-win tests @@ -387,8 +433,7 @@ patterns.oct: patterns.rif test-patterns-def: ref/patterns_def.hdr patterns_def.hdr $(RDU_PFILT) patterns_def.hdr | $(IMG_CMP) ref/patterns_def.hdr - -ref/patterns_def.hdr: - make patterns_def.hdr +ref/patterns_def.hdr: patterns_def.hdr $(RDU_PFILT) patterns_def.hdr > ref/patterns_def.hdr patterns_def.hdr: patterns.oct @@ -401,8 +446,7 @@ patterns_def.hdr: patterns.oct test-patterns-plan: ref/patterns_plan.hdr patterns_plan.hdr $(RDU_PFILT) patterns_plan.hdr | $(IMG_CMP) ref/patterns_plan.hdr - -ref/patterns_plan.hdr: - make patterns_plan.hdr +ref/patterns_plan.hdr: patterns_plan.hdr $(RDU_PFILT) patterns_plan.hdr > ref/patterns_plan.hdr patterns_plan.hdr: patterns.oct @@ -413,19 +457,18 @@ 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 ### test-mixtex-def: ref/mixtex_def.hdr mixtex_def.hdr $(RDU_PFILT) mixtex_def.hdr | $(IMG_CMP) ref/mixtex_def.hdr - -ref/mixtex_def.hdr: - make mixtex_def.hdr +ref/mixtex_def.hdr: 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 @@ -434,8 +477,7 @@ mixtex_def.hdr: mixtex.oct test-mixtex-fish: ref/mixtex_fish.hdr mixtex_fish.hdr $(RDU_PFILT) mixtex_fish.hdr | $(IMG_CMP) ref/mixtex_fish.hdr - -ref/mixtex_fish.hdr: - make mixtex_fish.hdr +ref/mixtex_fish.hdr: mixtex_fish.hdr $(RDU_PFILT) mixtex_fish.hdr > ref/mixtex_fish.hdr mixtex_fish.hdr: mixtex.oct @@ -448,8 +490,7 @@ mixtex_fish.hdr: mixtex.oct test-mixtex-plan: ref/mixtex_plan.hdr mixtex_plan.hdr $(RDU_PFILT) mixtex_plan.hdr | $(IMG_CMP) ref/mixtex_plan.hdr - -ref/mixtex_plan.hdr: - make mixtex_plan.hdr +ref/mixtex_plan.hdr: mixtex_plan.hdr $(RDU_PFILT) mixtex_plan.hdr > ref/mixtex_plan.hdr mixtex_plan.hdr: mixtex.oct @@ -462,11 +503,28 @@ mixtex_plan.hdr: mixtex.oct test-mixtex-rplan: ref/mixtex_rplan.hdr mixtex_rplan.hdr $(RDU_PFILT) mixtex_rplan.hdr | $(IMG_CMP) ref/mixtex_rplan.hdr - -ref/mixtex_rplan.hdr: - make mixtex_rplan.hdr +ref/mixtex_rplan.hdr: mixtex_rplan.hdr $(RDU_PFILT) mixtex_rplan.hdr > ref/mixtex_rplan.hdr mixtex_rplan.hdr: mixtex.oct rad -v rplan mixtex.rif ### End mixtex-rplan tests + +### Octree for spectra + +spectra.oct: spectra.rif + rad -v 0 spectra.rif + +### 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: 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