--- ray/test/renders/Makefile 2021/02/19 06:01:46 1.34 +++ ray/test/renders/Makefile 2024/01/17 18:57:54 1.39 @@ -1,4 +1,4 @@ -# RCSid $Id: Makefile,v 1.34 2021/02/19 06:01:46 greg Exp $ +# RCSid $Id: Makefile,v 1.39 2024/01/17 18:57:54 greg Exp $ # # Render and primitive type testing # @@ -18,14 +18,16 @@ 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-prism1-fish test-prism2-fish \ +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-trans2-win 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-mesh-cyl2 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 \ @@ -37,7 +39,8 @@ clean: 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 +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 @@ -107,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 @@ -121,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 @@ -140,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 @@ -154,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 @@ -168,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 @@ -187,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 @@ -201,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 @@ -220,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 @@ -234,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 @@ -248,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 @@ -267,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 @@ -281,8 +273,7 @@ mirror_fish.hdr: mirror.oct 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.rif @@ -300,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 @@ -319,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 @@ -338,8 +327,7 @@ tfunc1.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: tfunc1.oct @@ -352,8 +340,7 @@ tfunc_def.hdr: tfunc1.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: tfunc1.oct @@ -371,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 @@ -385,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 @@ -404,8 +389,7 @@ trans21.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: trans21.oct @@ -418,8 +402,7 @@ trans2_def.hdr: trans21.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: trans21.oct @@ -432,8 +415,7 @@ trans2_fish.hdr: trans21.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: trans21.oct @@ -451,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 @@ -465,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 @@ -484,8 +464,7 @@ mixtex.oct: mixtex.rif 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 @@ -498,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 @@ -512,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 @@ -526,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