ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/test/renders/Makefile
(Generate patch)

Comparing ray/test/renders/Makefile (file contents):
Revision 1.39 by greg, Wed Jan 17 18:57:54 2024 UTC vs.
Revision 1.42 by greg, Fri May 23 19:42:48 2025 UTC

# Line 17 | Line 17 | RDU_PFILT = pfilt -1 -r 1 -x 128 -y 128 -pa 1
17   IMG_CMP = radcompare -rel 0.007 -rms 0.1 -max 1.5
18  
19   # Default target is to test everything
20 < all:    test-xform test-oconv test-rad test-rfluxmtx test-rpiece \
21 < test-rpict test-mkpmap \
22 < test-trans2-def test-trans2-fish test-trans2-win \
23 < test-mixtex-def test-mixtex-fish test-mixtex-plan test-mixtex-rplan \
24 < test-tfunc-def test-tfunc-fish test-inst-def test-inst-fish \
25 < test-mesh-def test-mesh-cyl test-mesh-cyl2 test-mist-def \
26 < test-dielectric-def test-dielectric-fish test-trans-def \
27 < test-glass-def test-glass-fish test-glass-up \
28 < test-trans-fish test-patterns-def test-patterns-plan \
29 < test-rtrace test-mirror-fish test-obj2mesh \
30 < test-prism1-fish test-prism2-fish test-spectra-fish
20 > all:    batch1 batch2 batch3 batch4
21  
22   clean:
23          rm -f *.oct *.amb *_ill.dat blinds_ill?.dat *_*.hdr *.unf \
# Line 40 | Line 30 | batch1:        test-mixtex-def test-mixtex-fish test-mixtex-p
30   test-xform test-oconv test-rad test-obj2mesh
31  
32   batch2: test-rfluxmtx test-mist-def test-glass-def test-glass-fish test-glass-up \
33 < test-spectra-fish
33 > test-spectra-fish test-wgmdf-def
34  
35   batch3: test-inst-def test-inst-fish test-trans2-def test-trans2-fish test-trans2-win \
36   test-dielectric-def test-dielectric-fish
# Line 79 | Line 69 | test-obj2mesh: cab.obj
69  
70   ### Special test of rtrace ###
71  
72 < test-rtrace:    ref/mirror_fish.hdr rtmirror_fish.hdr
72 > test-rtrace:    rtmirror_fish.hdr
73          $(RDU_PFILT) rtmirror_fish.hdr | $(IMG_CMP) -h ref/mirror_fish.hdr -
74  
75   rtmirror_fish.hdr:      mirror.oct
# Line 91 | Line 81 | rtmirror_fish.hdr:     mirror.oct
81  
82   ### Special test for rfluxmtx (and rcontrib) ###
83  
84 < test-rfluxmtx:  ref/rfmirror.mtx rfmirror.mtx
84 > test-rfluxmtx:  rfmirror.mtx
85          radcompare -max .4 -rms .05 -rel 1e-4 ref/rfmirror.mtx rfmirror.mtx
86  
87   rfmirror.mtx:   mirror.rad dummysky.rad basic.mat diorama_walls.rad \
# Line 107 | Line 97 | dielectric.oct:        dielectric.rif
97  
98   ### Reference and test for dielectric view   def ###
99  
100 < test-dielectric-def:    ref/dielectric_def.hdr dielectric_def.hdr
100 > test-dielectric-def:    dielectric_def.hdr
101          $(RDU_PFILT) dielectric_def.hdr | $(IMG_CMP) ref/dielectric_def.hdr -
102  
103   ref/dielectric_def.hdr: dielectric_def.hdr
# Line 120 | Line 110 | dielectric_def.hdr:    dielectric.oct
110  
111   ### Reference and test for dielectric view  fish ###
112  
113 < test-dielectric-fish:   ref/dielectric_fish.hdr dielectric_fish.hdr
113 > test-dielectric-fish:   dielectric_fish.hdr
114          $(RDU_PFILT) dielectric_fish.hdr | $(IMG_CMP) ref/dielectric_fish.hdr -
115  
116   ref/dielectric_fish.hdr:        dielectric_fish.hdr
# Line 138 | Line 128 | glass.oct:     glass.rif
128  
129   ### Reference and test for   glass view   def ###
130  
131 < test-glass-def: ref/glass_def.hdr   glass_def.hdr
131 > test-glass-def:         glass_def.hdr
132          $(RDU_PFILT)   glass_def.hdr | $(IMG_CMP) ref/glass_def.hdr -
133  
134   ref/glass_def.hdr:      glass_def.hdr
# Line 151 | Line 141 | glass_def.hdr: glass.oct
141  
142   ### Reference and test for   glass view  fish ###
143  
144 < test-glass-fish:        ref/glass_fish.hdr   glass_fish.hdr
144 > test-glass-fish:        glass_fish.hdr
145          $(RDU_PFILT)   glass_fish.hdr | $(IMG_CMP) ref/glass_fish.hdr -
146  
147   ref/glass_fish.hdr:     glass_fish.hdr
# Line 164 | Line 154 | glass_fish.hdr:        glass.oct
154  
155   ### Reference and test for   glass view    up ###
156  
157 < test-glass-up:  ref/glass_up.hdr   glass_up.hdr
157 > test-glass-up:  glass_up.hdr
158          $(RDU_PFILT)   glass_up.hdr | $(IMG_CMP) ref/glass_up.hdr -
159  
160   ref/glass_up.hdr:       glass_up.hdr
# Line 182 | Line 172 | inst.oct:      inst.rif
172  
173   ### Reference and test for    inst view   def ###
174  
175 < test-inst-def:  ref/inst_def.hdr    inst_def.hdr
175 > test-inst-def:  inst_def.hdr
176          $(RDU_PFILT)    inst_def.hdr | $(IMG_CMP) ref/inst_def.hdr -
177  
178   ref/inst_def.hdr:       inst_def.hdr
# Line 195 | Line 185 | inst_def.hdr:  inst.oct
185  
186   ### Reference and test for    inst view  fish ###
187  
188 < test-inst-fish: ref/inst_fish.hdr    inst_fish.hdr
188 > test-inst-fish: inst_fish.hdr
189          $(RDU_PFILT)    inst_fish.hdr | $(IMG_CMP) ref/inst_fish.hdr -
190  
191   ref/inst_fish.hdr:      inst_fish.hdr
# Line 213 | Line 203 | mesh.oct:      mesh.rif
203  
204   ### Reference and test for    mesh view   def ###
205  
206 < test-mesh-def:  ref/mesh_def.hdr    mesh_def.hdr
206 > test-mesh-def:  mesh_def.hdr
207          $(RDU_PFILT)    mesh_def.hdr | $(IMG_CMP) ref/mesh_def.hdr -
208  
209   ref/mesh_def.hdr:       mesh_def.hdr
# Line 226 | Line 216 | mesh_def.hdr:  mesh.oct
216  
217   ### Reference and test for    mesh view   cyl ###
218  
219 < test-mesh-cyl:  ref/mesh_cyl.hdr    mesh_cyl.hdr
219 > test-mesh-cyl:  mesh_cyl.hdr
220          $(RDU_PFILT)    mesh_cyl.hdr | $(IMG_CMP) ref/mesh_cyl.hdr -
221  
222   ref/mesh_cyl.hdr:       mesh_cyl.hdr
# Line 239 | Line 229 | mesh_cyl.hdr:  mesh.oct
229  
230   ### Reference and test for    mesh view  cyl2 ###
231  
232 < test-mesh-cyl2: ref/mesh_cyl2.hdr    mesh_cyl2.hdr
232 > test-mesh-cyl2:         mesh_cyl2.hdr
233          $(RDU_PFILT)    mesh_cyl2.hdr | $(IMG_CMP) ref/mesh_cyl2.hdr -
234  
235   ref/mesh_cyl2.hdr:      mesh_cyl2.hdr
# Line 257 | Line 247 | mirror.oct:    mirror.rif
247  
248   ### Reference and test for  mirror view  fish ###
249  
250 < test-mirror-fish:       ref/mirror_fish.hdr  mirror_fish.hdr
250 > test-mirror-fish:       mirror_fish.hdr
251          $(RDU_PFILT)  mirror_fish.hdr | $(IMG_CMP) ref/mirror_fish.hdr -
252  
253   ref/mirror_fish.hdr:    mirror_fish.hdr
# Line 270 | Line 260 | mirror_fish.hdr:       mirror.oct
260  
261   ### Reference and test for    mist view   def ###
262  
263 < test-mist-def:  ref/mist_def.hdr    mist_def.hdr
263 > test-mist-def:  mist_def.hdr
264          $(RDU_PFILT)    mist_def.hdr | $(IMG_CMP) ref/mist_def.hdr -
265  
266   ref/mist_def.hdr:       mist_def.hdr
# Line 288 | Line 278 | prism1.oct:    prism1.rif
278  
279   ### Reference and test for  prism1 view  fish ###
280  
281 < test-prism1-fish:       ref/prism1_fish.hdr  prism1_fish.hdr
281 > test-prism1-fish:       prism1_fish.hdr
282          $(RDU_PFILT)  prism1_fish.hdr | $(IMG_CMP) ref/prism1_fish.hdr -
283  
284   ref/prism1_fish.hdr:    prism1_fish.hdr
# Line 306 | Line 296 | prism2.oct:    prism2.rif
296  
297   ### Reference and test for  prism2 view  fish ###
298  
299 < test-prism2-fish:       ref/prism2_fish.hdr  prism2_fish.hdr
299 > test-prism2-fish:       prism2_fish.hdr
300          $(RDU_PFILT)  prism2_fish.hdr | $(IMG_CMP) ref/prism2_fish.hdr -
301  
302   ref/prism2_fish.hdr:    prism2_fish.hdr
# Line 324 | Line 314 | tfunc1.oct:    tfunc.rif
314  
315   ### Reference and test for   tfunc view   def ###
316  
317 < test-tfunc-def: ref/tfunc_def.hdr   tfunc_def.hdr
317 > test-tfunc-def:         tfunc_def.hdr
318          $(RDU_PFILT)   tfunc_def.hdr | $(IMG_CMP) ref/tfunc_def.hdr -
319  
320   ref/tfunc_def.hdr:      tfunc_def.hdr
# Line 337 | Line 327 | tfunc_def.hdr: tfunc1.oct
327  
328   ### Reference and test for   tfunc view  fish ###
329  
330 < test-tfunc-fish:        ref/tfunc_fish.hdr   tfunc_fish.hdr
330 > test-tfunc-fish:        tfunc_fish.hdr
331          $(RDU_PFILT)   tfunc_fish.hdr | $(IMG_CMP) ref/tfunc_fish.hdr -
332  
333   ref/tfunc_fish.hdr:     tfunc_fish.hdr
# Line 355 | Line 345 | trans.oct:     trans.rif
345  
346   ### Reference and test for   trans view   def ###
347  
348 < test-trans-def: ref/trans_def.hdr   trans_def.hdr
348 > test-trans-def:         trans_def.hdr
349          $(RDU_PFILT)   trans_def.hdr | $(IMG_CMP) ref/trans_def.hdr -
350  
351   ref/trans_def.hdr:       trans_def.hdr
# Line 368 | Line 358 | trans_def.hdr: trans.oct
358  
359   ### Reference and test for   trans view  fish ###
360  
361 < test-trans-fish:        ref/trans_fish.hdr   trans_fish.hdr
361 > test-trans-fish:        trans_fish.hdr
362          $(RDU_PFILT)   trans_fish.hdr | $(IMG_CMP) ref/trans_fish.hdr -
363  
364   ref/trans_fish.hdr:     trans_fish.hdr
# Line 386 | Line 376 | trans21.oct:   trans2.rif
376  
377   ### Reference and test for  trans2 view   def ###
378  
379 < test-trans2-def:        ref/trans2_def.hdr  trans2_def.hdr
379 > test-trans2-def:        trans2_def.hdr
380          $(RDU_PFILT)  trans2_def.hdr | $(IMG_CMP) ref/trans2_def.hdr -
381  
382   ref/trans2_def.hdr:     trans2_def.hdr
# Line 399 | Line 389 | trans2_def.hdr:        trans21.oct
389  
390   ### Reference and test for  trans2 view  fish ###
391  
392 < test-trans2-fish:       ref/trans2_fish.hdr  trans2_fish.hdr
392 > test-trans2-fish:       trans2_fish.hdr
393          $(RDU_PFILT)  trans2_fish.hdr | $(IMG_CMP) ref/trans2_fish.hdr -
394  
395   ref/trans2_fish.hdr:    trans2_fish.hdr
# Line 412 | Line 402 | trans2_fish.hdr:       trans21.oct
402  
403   ### Reference and test for  trans2 view   win ###
404  
405 < test-trans2-win:        ref/trans2_win.hdr  trans2_win.hdr
405 > test-trans2-win:        trans2_win.hdr
406          $(RDU_PFILT)  trans2_win.hdr | $(IMG_CMP) ref/trans2_win.hdr -
407  
408   ref/trans2_win.hdr:     trans2_win.hdr
# Line 430 | Line 420 | patterns.oct:  patterns.rif
420  
421   ### Reference and test for patterns view   def ###
422  
423 < test-patterns-def:      ref/patterns_def.hdr patterns_def.hdr
423 > test-patterns-def:      patterns_def.hdr
424          $(RDU_PFILT) patterns_def.hdr | $(IMG_CMP) ref/patterns_def.hdr -
425  
426   ref/patterns_def.hdr:   patterns_def.hdr
# Line 443 | Line 433 | patterns_def.hdr:      patterns.oct
433  
434   ### Reference and test for patterns view   plan ###
435  
436 < test-patterns-plan:     ref/patterns_plan.hdr patterns_plan.hdr
436 > test-patterns-plan:     patterns_plan.hdr
437          $(RDU_PFILT) patterns_plan.hdr | $(IMG_CMP) ref/patterns_plan.hdr -
438  
439   ref/patterns_plan.hdr:  patterns_plan.hdr
# Line 461 | Line 451 | mixtex.oct:    mixtex.rif
451  
452   ### Reference and test for  mixtex view   def ###
453  
454 < test-mixtex-def:        ref/mixtex_def.hdr  mixtex_def.hdr
454 > test-mixtex-def:        mixtex_def.hdr
455          $(RDU_PFILT)  mixtex_def.hdr | $(IMG_CMP) ref/mixtex_def.hdr -
456  
457   ref/mixtex_def.hdr:     mixtex_def.hdr
# Line 474 | Line 464 | mixtex_def.hdr:        mixtex.oct
464  
465   ### Reference and test for  mixtex view  fish ###
466  
467 < test-mixtex-fish:       ref/mixtex_fish.hdr  mixtex_fish.hdr
467 > test-mixtex-fish:       mixtex_fish.hdr
468          $(RDU_PFILT)  mixtex_fish.hdr | $(IMG_CMP) ref/mixtex_fish.hdr -
469  
470   ref/mixtex_fish.hdr:    mixtex_fish.hdr
# Line 487 | Line 477 | mixtex_fish.hdr:       mixtex.oct
477  
478   ### Reference and test for  mixtex view  plan ###
479  
480 < test-mixtex-plan:       ref/mixtex_plan.hdr  mixtex_plan.hdr
480 > test-mixtex-plan:       mixtex_plan.hdr
481          $(RDU_PFILT)  mixtex_plan.hdr | $(IMG_CMP) ref/mixtex_plan.hdr -
482  
483   ref/mixtex_plan.hdr:    mixtex_plan.hdr
# Line 500 | Line 490 | mixtex_plan.hdr:       mixtex.oct
490  
491   ### Reference and test for  mixtex view rplan ###
492  
493 < test-mixtex-rplan:      ref/mixtex_rplan.hdr  mixtex_rplan.hdr
493 > test-mixtex-rplan:      mixtex_rplan.hdr
494          $(RDU_PFILT)  mixtex_rplan.hdr | $(IMG_CMP) ref/mixtex_rplan.hdr -
495  
496   ref/mixtex_rplan.hdr:   mixtex_rplan.hdr
# Line 518 | Line 508 | spectra.oct:   spectra.rif
508  
509   ### Reference and test for spectra fish ###
510  
511 < test-spectra-fish:      ref/spectra_fish.hdr spectra_fish.hdr
511 > test-spectra-fish:      spectra_fish.hdr
512          $(RDU_PFILT) spectra_fish.hdr | $(IMG_CMP) ref/spectra_fish.hdr -
513  
514   ref/spectra_fish.hdr:   spectra_fish.hdr
# Line 528 | Line 518 | spectra_fish.hdr:      spectra.oct
518          rad -v fish spectra.rif
519  
520   ### End spectra-fish tests
521 +
522 + ### Octree for wgmdf
523 +
524 + wgmdf.oct:      wgmdf.rif
525 +        rad -v 0 wgmdf.rif
526 +
527 + ### Reference and test for wgmdf def ###
528 +
529 + test-wgmdf-def: wgmdf_def.hdr
530 +        $(RDU_PFILT) wgmdf_def.hdr | $(IMG_CMP) ref/wgmdf_def.hdr -
531 +
532 + ref/wgmdf_def.hdr:      wgmdf_def.hdr
533 +        $(RDU_PFILT) wgmdf_def.hdr > ref/wgmdf_def.hdr
534 +
535 + wgmdf_def.hdr:  wgmdf.oct
536 +        rad -v def wgmdf.rif
537 +
538 + ### End of wgmdf-def tests

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines