--- ray/test/renders/Makefile 2020/07/30 02:19:27 1.27 +++ ray/test/renders/Makefile 2024/03/12 15:49:18 1.40 @@ -1,4 +1,4 @@ -# RCSid $Id: Makefile,v 1.27 2020/07/30 02:19:27 greg Exp $ +# RCSid $Id: Makefile,v 1.40 2024/03/12 15:49:18 greg Exp $ # # Render and primitive type testing # @@ -14,23 +14,41 @@ endif 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 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 \ +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 @@ -61,19 +79,19 @@ test-obj2mesh: cab.obj ### Special test of rtrace ### -test-rtrace: ref/mirror_fish.hdr rtmirror_fish.hdr +test-rtrace: 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 ### Special test for rfluxmtx (and rcontrib) ### -test-rfluxmtx: ref/rfmirror.mtx rfmirror.mtx +test-rfluxmtx: 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 \ @@ -89,11 +107,10 @@ dielectric.oct: dielectric.rif ### Reference and test for dielectric view def ### -test-dielectric-def: ref/dielectric_def.hdr dielectric_def.hdr +test-dielectric-def: 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 @@ -103,11 +120,10 @@ dielectric_def.hdr: dielectric.oct ### Reference and test for dielectric view fish ### -test-dielectric-fish: ref/dielectric_fish.hdr dielectric_fish.hdr +test-dielectric-fish: 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 @@ -122,11 +138,10 @@ glass.oct: glass.rif ### Reference and test for glass view def ### -test-glass-def: ref/glass_def.hdr glass_def.hdr +test-glass-def: 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 @@ -136,11 +151,10 @@ glass_def.hdr: glass.oct ### Reference and test for glass view fish ### -test-glass-fish: ref/glass_fish.hdr glass_fish.hdr +test-glass-fish: 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 @@ -150,11 +164,10 @@ glass_fish.hdr: glass.oct ### Reference and test for glass view up ### -test-glass-up: ref/glass_up.hdr glass_up.hdr +test-glass-up: 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 @@ -169,11 +182,10 @@ inst.oct: inst.rif ### Reference and test for inst view def ### -test-inst-def: ref/inst_def.hdr inst_def.hdr +test-inst-def: 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 @@ -183,11 +195,10 @@ inst_def.hdr: inst.oct ### Reference and test for inst view fish ### -test-inst-fish: ref/inst_fish.hdr inst_fish.hdr +test-inst-fish: 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 @@ -202,11 +213,10 @@ mesh.oct: mesh.rif ### Reference and test for mesh view def ### -test-mesh-def: ref/mesh_def.hdr mesh_def.hdr +test-mesh-def: 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 @@ -216,11 +226,10 @@ mesh_def.hdr: mesh.oct ### Reference and test for mesh view cyl ### -test-mesh-cyl: ref/mesh_cyl.hdr mesh_cyl.hdr +test-mesh-cyl: 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 @@ -230,11 +239,10 @@ mesh_cyl.hdr: mesh.oct ### Reference and test for mesh view cyl2 ### -test-mesh-cyl2: ref/mesh_cyl2.hdr mesh_cyl2.hdr +test-mesh-cyl2: 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 @@ -249,11 +257,10 @@ mirror.oct: mirror.rif ### Reference and test for mirror view fish ### -test-mirror-fish: ref/mirror_fish.hdr mirror_fish.hdr +test-mirror-fish: 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 @@ -263,11 +270,10 @@ mirror_fish.hdr: mirror.oct ### Reference and test for mist view def ### -test-mist-def: ref/mist_def.hdr mist_def.hdr +test-mist-def: 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.rif @@ -282,11 +288,10 @@ prism1.oct: prism1.rif ### Reference and test for prism1 view fish ### -test-prism1-fish: ref/prism1_fish.hdr prism1_fish.hdr +test-prism1-fish: 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 @@ -301,11 +306,10 @@ prism2.oct: prism2.rif ### Reference and test for prism2 view fish ### -test-prism2-fish: ref/prism2_fish.hdr prism2_fish.hdr +test-prism2-fish: 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 @@ -320,11 +324,10 @@ tfunc1.oct: tfunc.rif ### Reference and test for tfunc view def ### -test-tfunc-def: ref/tfunc_def.hdr tfunc_def.hdr +test-tfunc-def: 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: tfunc1.oct @@ -334,11 +337,10 @@ tfunc_def.hdr: tfunc1.oct ### Reference and test for tfunc view fish ### -test-tfunc-fish: ref/tfunc_fish.hdr tfunc_fish.hdr +test-tfunc-fish: 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: tfunc1.oct @@ -353,11 +355,10 @@ trans.oct: trans.rif ### Reference and test for trans view def ### -test-trans-def: ref/trans_def.hdr trans_def.hdr +test-trans-def: 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 @@ -367,11 +368,10 @@ trans_def.hdr: trans.oct ### Reference and test for trans view fish ### -test-trans-fish: ref/trans_fish.hdr trans_fish.hdr +test-trans-fish: 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 @@ -386,11 +386,10 @@ trans21.oct: trans2.rif ### Reference and test for trans2 view def ### -test-trans2-def: ref/trans2_def.hdr trans2_def.hdr +test-trans2-def: 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: trans21.oct @@ -400,11 +399,10 @@ trans2_def.hdr: trans21.oct ### Reference and test for trans2 view fish ### -test-trans2-fish: ref/trans2_fish.hdr trans2_fish.hdr +test-trans2-fish: 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: trans21.oct @@ -414,11 +412,10 @@ trans2_fish.hdr: trans21.oct ### Reference and test for trans2 view win ### -test-trans2-win: ref/trans2_win.hdr trans2_win.hdr +test-trans2-win: 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: trans21.oct @@ -433,11 +430,10 @@ patterns.oct: patterns.rif ### Reference and test for patterns view def ### -test-patterns-def: ref/patterns_def.hdr patterns_def.hdr +test-patterns-def: 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 @@ -447,11 +443,10 @@ patterns_def.hdr: patterns.oct ### Reference and test for patterns view plan ### -test-patterns-plan: ref/patterns_plan.hdr patterns_plan.hdr +test-patterns-plan: 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 @@ -466,11 +461,10 @@ mixtex.oct: mixtex.rif ### Reference and test for mixtex view def ### -test-mixtex-def: ref/mixtex_def.hdr mixtex_def.hdr +test-mixtex-def: 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 @@ -480,11 +474,10 @@ mixtex_def.hdr: mixtex.oct ### Reference and test for mixtex view fish ### -test-mixtex-fish: ref/mixtex_fish.hdr mixtex_fish.hdr +test-mixtex-fish: 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 @@ -494,11 +487,10 @@ mixtex_fish.hdr: mixtex.oct ### Reference and test for mixtex view plan ### -test-mixtex-plan: ref/mixtex_plan.hdr mixtex_plan.hdr +test-mixtex-plan: 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 @@ -508,14 +500,31 @@ mixtex_plan.hdr: mixtex.oct ### Reference and test for mixtex view rplan ### -test-mixtex-rplan: ref/mixtex_rplan.hdr mixtex_rplan.hdr +test-mixtex-rplan: 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: 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