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.18 by greg, Tue Jan 8 00:21:52 2019 UTC vs.
Revision 1.34 by greg, Fri Feb 19 06:01:46 2021 UTC

# Line 4 | Line 4
4   #
5  
6   # Number of processes to use on tests that run multi-core
7 < NPROC = 2
7 > ifeq ($(OS),Windows_NT)  # is Windows
8 >        NPROC := 1
9 > else
10 >        NPROC := 2
11 > endif
12  
13   # Image reduction for comparisons
14   RDU_PFILT = pfilt -1 -r 1 -x 128 -y 128 -pa 1
15  
16   # Image comparison command
17 < IMG_CMP = radcompare -rms 0.07 -max 1.5
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 \
21 > test-rpict test-mkpmap test-prism1-fish test-prism2-fish \
22   test-mixtex-def test-mixtex-fish test-mixtex-plan test-mixtex-rplan \
23 < test-trans2-def test-trans2-fish test-dielectric-def \
23 > test-trans2-def test-trans2-fish test-trans2-win test-dielectric-def \
24   test-dielectric-fish test-glass-def test-glass-fish test-glass-up \
25   test-tfunc-def test-tfunc-fish test-inst-def test-inst-fish \
26 < test-mesh-def test-mesh-cyl test-mirror-fish test-mist-def \
26 > test-mesh-def test-mesh-cyl test-mesh-cyl2 test-mirror-fish test-mist-def \
27   test-trans-def test-trans-fish test-patterns-def test-patterns-plan \
28 < test-rtrace
28 > test-rtrace test-obj2mesh
29  
30   clean:
31          rm -f *.oct *.amb *_ill.dat blinds_ill?.dat *_*.hdr *.unf \
32   *.[cg]pm{,.leaf} inst_rad.txt combined.rad rfmirror.mtx
33  
34 + ######
35 + # More-or-less evenly divided batches for NPROC=1 (redundancies removed)
36 +
37 + batch1: test-mixtex-def test-mixtex-fish test-mixtex-plan test-mixtex-rplan \
38 + test-xform test-oconv test-rad test-obj2mesh
39 +
40 + batch2: test-rfluxmtx test-mist-def test-glass-def test-glass-fish test-glass-up
41 +
42 + batch3: test-inst-def test-inst-fish test-trans2-def test-trans2-fish test-trans2-win \
43 + test-dielectric-def test-dielectric-fish
44 +
45 + batch4: test-rtrace test-prism1-fish test-prism2-fish test-mirror-fish \
46 + test-mesh-def test-mesh-cyl test-mesh-cyl2 test-tfunc-def test-tfunc-fish \
47 + test-trans-def test-trans-fish test-patterns-def test-patterns-plan
48 +
49   ### Test Aliases ###
50  
51 < test-rpict:     test-mirror-def
51 > test-rpict:     test-mirror-fish
52  
53   test-rpiece test-mkpmap:        test-mixtex-def
54  
55   ### Special test of xform ###
56  
57 < test-xform:     combined_scene.rad
58 <        xform -f combined_scene.rad | grep -v '^[       ]*#' > combined.rad
40 <        radcompare -max 0.04 ref/combined.rad combined.rad
57 > test-xform:     combined.rad
58 >        radcompare "-c#" -max 0.04 ref/combined.rad combined.rad
59  
60 + combined.rad:   combined_scene.rad
61 +        xform -f combined_scene.rad > combined.rad
62 +
63   ### Special test of rad ###
64  
65 < test-rad:       inst.rif
65 > test-rad:       inst.oct
66          rad -n -s -e inst.rif > inst_rad.txt
67          radcompare ref/inst_rad.txt inst_rad.txt
68  
69 < ### Special test of oconv ###
69 > ### Special tests of oconv and obj2mesh ###
70  
71   test-oconv:     inst.oct
72          radcompare ref/inst.oct inst.oct
73  
74 + test-obj2mesh:  cab.obj
75 +        obj2mesh -w cab.obj | radcompare ref/cab.rtm -
76 +
77   ### Special test of rtrace ###
78  
79 < test-rtrace:    ref/mirror_fish.hdr  rtmirror_fish.hdr
79 > test-rtrace:    ref/mirror_fish.hdr rtmirror_fish.hdr
80          $(RDU_PFILT) rtmirror_fish.hdr | $(IMG_CMP) -h ref/mirror_fish.hdr -
81  
82   rtmirror_fish.hdr:      mirror.oct
83          rad -v 0 mirror.rif OPT=mirror.opt
84 <        vwrays -ff -vf fish.vf -x 2048 -y 2048 | rtrace -n $(NPROC) @mirror.opt \
85 < -ffc -x 2048 -y 2048 mirror.oct | pfilt -1 -e +3 -r .6 -x /2 -y /2 \
84 >        vwrays -ff -vf fish.vf -x 2048 -y 1991 | rtrace -n $(NPROC) @mirror.opt \
85 > -ffc -x 2048 -y 1991 mirror.oct | pfilt -1 -e +3 -r .6 -x /2 -y /2 \
86   > rtmirror_fish.hdr
87          rm -f mirror.opt
88  
89   ### Special test for rfluxmtx (and rcontrib) ###
90  
91   test-rfluxmtx:  ref/rfmirror.mtx rfmirror.mtx
92 <        radcompare -max .4 -rms .05 ref/rfmirror.mtx rfmirror.mtx
92 >        radcompare -max .4 -rms .05 -rel 1e-4 ref/rfmirror.mtx rfmirror.mtx
93  
94   rfmirror.mtx:   mirror.rad dummysky.rad basic.mat diorama_walls.rad \
95   closed_end.rad front_cap.rad glass_pane.rad antimatter_portal.rad
# Line 306 | Line 330 | prism2_fish.hdr:       prism2.oct
330  
331   ### Octree for   tfunc ###
332  
333 < tfunc.oct:      tfunc.rif
333 > tfunc1.oct:     tfunc.rif
334          rad -v 0   tfunc.rif
335  
336   ### Reference and test for   tfunc view   def ###
# Line 318 | Line 342 | ref/tfunc_def.hdr:
342          make   tfunc_def.hdr
343          $(RDU_PFILT)   tfunc_def.hdr > ref/tfunc_def.hdr
344  
345 < tfunc_def.hdr:  tfunc.oct
345 > tfunc_def.hdr:  tfunc1.oct
346          rad -v   def   tfunc.rif
347  
348   ### End   tfunc-def   tests
# Line 332 | Line 356 | ref/tfunc_fish.hdr:
356          make   tfunc_fish.hdr
357          $(RDU_PFILT)   tfunc_fish.hdr > ref/tfunc_fish.hdr
358  
359 < tfunc_fish.hdr: tfunc.oct
359 > tfunc_fish.hdr: tfunc1.oct
360          rad -v  fish   tfunc.rif
361  
362   ### End   tfunc-fish  tests
# Line 372 | Line 396 | trans_fish.hdr:        trans.oct
396  
397   ### Octree for  trans2 ###
398  
399 < trans2.oct:     trans2.rif
399 > trans21.oct:    trans2.rif
400          rad -v 0  trans2.rif
401  
402   ### Reference and test for  trans2 view   def ###
# Line 384 | Line 408 | ref/trans2_def.hdr:
408          make  trans2_def.hdr
409          $(RDU_PFILT)  trans2_def.hdr > ref/trans2_def.hdr
410  
411 < trans2_def.hdr: trans2.oct
411 > trans2_def.hdr: trans21.oct
412          rad -v   def  trans2.rif
413  
414   ### End  trans2-def   tests
# Line 398 | Line 422 | ref/trans2_fish.hdr:
422          make  trans2_fish.hdr
423          $(RDU_PFILT)  trans2_fish.hdr > ref/trans2_fish.hdr
424  
425 < trans2_fish.hdr:        trans2.oct
425 > trans2_fish.hdr:        trans21.oct
426          rad -v  fish  trans2.rif
427  
428   ### End  trans2-fish  tests
# Line 412 | Line 436 | ref/trans2_win.hdr:
436          make  trans2_win.hdr
437          $(RDU_PFILT)  trans2_win.hdr > ref/trans2_win.hdr
438  
439 < trans2_win.hdr: trans2.oct
439 > trans2_win.hdr: trans21.oct
440          rad -v   win  trans2.rif
441  
442   ### End  trans2-win   tests

Diff Legend

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