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.1 by greg, Sat Nov 17 22:09:12 2018 UTC vs.
Revision 1.37 by greg, Fri Nov 17 22:03:14 2023 UTC

# Line 3 | Line 3
3   # Render and primitive type testing
4   #
5  
6 + # Number of processes to use on tests that run multi-core
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.08 -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-dielectric-def test-dielectric-fish test-glass-def \
21 < test-glass-fish test-glass-up test-inst-def test-inst-fish \
22 < test-mesh-def test-mesh-cyl test-mirror-fish test-mist-def \
23 < test-tfunc-def test-tfunc-fish test-trans-def test-trans-fish \
24 < test-trans2-def test-trans2-fish
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
31  
32   clean:
33 <        rm -f *.oct *.amb *.dat *_*.hdr
33 >        rm -f *.oct *.amb *_ill.dat blinds_ill?.dat *_*.hdr *.unf \
34 > *.[cg]pm{,.leaf} inst_rad.txt combined.rad rfmirror.mtx
35  
36 < ### Reference and test for dielectric view def ###
36 > ######
37 > # More-or-less evenly divided batches for NPROC=1 (redundancies removed)
38  
39 + batch1: test-mixtex-def test-mixtex-fish test-mixtex-plan test-mixtex-rplan \
40 + test-xform test-oconv test-rad test-obj2mesh
41 +
42 + batch2: test-rfluxmtx test-mist-def test-glass-def test-glass-fish test-glass-up
43 +
44 + batch3: test-inst-def test-inst-fish test-trans2-def test-trans2-fish test-trans2-win \
45 + test-dielectric-def test-dielectric-fish
46 +
47 + batch4: test-rtrace test-prism1-fish test-prism2-fish test-mirror-fish \
48 + test-mesh-def test-mesh-cyl test-mesh-cyl2 test-tfunc-def test-tfunc-fish \
49 + test-trans-def test-trans-fish test-patterns-def test-patterns-plan
50 +
51 + ### Test Aliases ###
52 +
53 + test-rpict:     test-mirror-fish
54 +
55 + test-rpiece test-mkpmap:        test-mixtex-def
56 +
57 + ### Special test of xform ###
58 +
59 + test-xform:     combined.rad
60 +        radcompare "-c#" -max 0.04 ref/combined.rad combined.rad
61 +
62 + combined.rad:   combined_scene.rad
63 +        xform -f combined_scene.rad > combined.rad
64 +
65 + ### Special test of rad ###
66 +
67 + test-rad:       inst.oct
68 +        rad -n -s -e inst.rif > inst_rad.txt
69 +        radcompare ref/inst_rad.txt inst_rad.txt
70 +
71 + ### Special tests of oconv and obj2mesh ###
72 +
73 + test-oconv:     inst.oct
74 +        radcompare ref/inst.oct inst.oct
75 +
76 + test-obj2mesh:  cab.obj
77 +        obj2mesh -w cab.obj | radcompare ref/cab.rtm -
78 +
79 + ### Special test of rtrace ###
80 +
81 + test-rtrace:    ref/mirror_fish.hdr rtmirror_fish.hdr
82 +        $(RDU_PFILT) rtmirror_fish.hdr | $(IMG_CMP) -h ref/mirror_fish.hdr -
83 +
84 + rtmirror_fish.hdr:      mirror.oct
85 +        rad -v 0 mirror.rif OPT=mirror.opt
86 +        vwrays -ff -vf fish.vf -x 2048 -y 1991 | rtrace -n $(NPROC) @mirror.opt \
87 + -ffc -x 2048 -y 1991 mirror.oct | pfilt -1 -e +3 -r .6 -x /2 -y /2 \
88 + > rtmirror_fish.hdr
89 +        rm -f mirror.opt
90 +
91 + ### Special test for rfluxmtx (and rcontrib) ###
92 +
93 + test-rfluxmtx:  ref/rfmirror.mtx rfmirror.mtx
94 +        radcompare -max .4 -rms .05 -rel 1e-4 ref/rfmirror.mtx rfmirror.mtx
95 +
96 + rfmirror.mtx:   mirror.rad dummysky.rad basic.mat diorama_walls.rad \
97 + closed_end.rad front_cap.rad glass_pane.rad antimatter_portal.rad
98 +        rfluxmtx -n $(NPROC) -ab 2 -lw 1e-4 mirror.rad dummysky.rad \
99 + basic.mat diorama_walls.rad closed_end.rad front_cap.rad \
100 + glass_pane.rad antimatter_portal.rad > rfmirror.mtx
101 +
102 + ### Octree for dielectric ###
103 +
104 + dielectric.oct: dielectric.rif
105 +        rad -v 0 dielectric.rif
106 +
107 + ### Reference and test for dielectric view   def ###
108 +
109   test-dielectric-def:    ref/dielectric_def.hdr dielectric_def.hdr
110          $(RDU_PFILT) dielectric_def.hdr | $(IMG_CMP) ref/dielectric_def.hdr -
111  
# Line 28 | Line 113 | ref/dielectric_def.hdr:
113          make dielectric_def.hdr
114          $(RDU_PFILT) dielectric_def.hdr > ref/dielectric_def.hdr
115  
116 < dielectric_def.hdr:     dielectric.rif
117 <        rad -v def dielectric.rif
116 > dielectric_def.hdr:     dielectric.oct
117 >        rad -v   def dielectric.rif
118  
119 < ### End dielectric-def tests
119 > ### End dielectric-def   tests
120  
121 < ### Reference and test for dielectric view fish ###
121 > ### Reference and test for dielectric view  fish ###
122  
123   test-dielectric-fish:   ref/dielectric_fish.hdr dielectric_fish.hdr
124          $(RDU_PFILT) dielectric_fish.hdr | $(IMG_CMP) ref/dielectric_fish.hdr -
# Line 42 | Line 127 | ref/dielectric_fish.hdr:
127          make dielectric_fish.hdr
128          $(RDU_PFILT) dielectric_fish.hdr > ref/dielectric_fish.hdr
129  
130 < dielectric_fish.hdr:    dielectric.rif
131 <        rad -v fish dielectric.rif
130 > dielectric_fish.hdr:    dielectric.oct
131 >        rad -v  fish dielectric.rif
132  
133 < ### End dielectric-fish tests
133 > ### End dielectric-fish  tests
134  
135 < ### Reference and test for glass view def ###
135 > ### Octree for   glass ###
136  
137 < test-glass-def: ref/glass_def.hdr glass_def.hdr
138 <        $(RDU_PFILT) glass_def.hdr | $(IMG_CMP) ref/glass_def.hdr -
137 > glass.oct:      glass.rif
138 >        rad -v 0   glass.rif
139  
140 + ### Reference and test for   glass view   def ###
141 +
142 + test-glass-def: ref/glass_def.hdr   glass_def.hdr
143 +        $(RDU_PFILT)   glass_def.hdr | $(IMG_CMP) ref/glass_def.hdr -
144 +
145   ref/glass_def.hdr:
146 <        make -s glass_def.hdr
147 <        $(RDU_PFILT) glass_def.hdr > ref/glass_def.hdr
146 >        make   glass_def.hdr
147 >        $(RDU_PFILT)   glass_def.hdr > ref/glass_def.hdr
148  
149 < glass_def.hdr:  glass.rif
150 <        rad -v def glass.rif
149 > glass_def.hdr:  glass.oct
150 >        rad -v   def   glass.rif
151  
152 < ### End glass-def tests
152 > ### End   glass-def   tests
153  
154 < ### Reference and test for glass view fish ###
154 > ### Reference and test for   glass view  fish ###
155  
156 < test-glass-fish:        ref/glass_fish.hdr glass_fish.hdr
157 <        $(RDU_PFILT) glass_fish.hdr | $(IMG_CMP) ref/glass_fish.hdr -
156 > test-glass-fish:        ref/glass_fish.hdr   glass_fish.hdr
157 >        $(RDU_PFILT)   glass_fish.hdr | $(IMG_CMP) ref/glass_fish.hdr -
158  
159   ref/glass_fish.hdr:
160 <        make -s glass_fish.hdr
161 <        $(RDU_PFILT) glass_fish.hdr > ref/glass_fish.hdr
160 >        make   glass_fish.hdr
161 >        $(RDU_PFILT)   glass_fish.hdr > ref/glass_fish.hdr
162  
163 < glass_fish.hdr: glass.rif
164 <        rad -v fish glass.rif
163 > glass_fish.hdr: glass.oct
164 >        rad -v  fish   glass.rif
165  
166 < ### End glass-fish tests
166 > ### End   glass-fish  tests
167  
168 < ### Reference and test for glass view up ###
168 > ### Reference and test for   glass view    up ###
169  
170 < test-glass-up:  ref/glass_up.hdr glass_up.hdr
171 <        $(RDU_PFILT) glass_up.hdr | $(IMG_CMP) ref/glass_up.hdr -
170 > test-glass-up:  ref/glass_up.hdr   glass_up.hdr
171 >        $(RDU_PFILT)   glass_up.hdr | $(IMG_CMP) ref/glass_up.hdr -
172  
173   ref/glass_up.hdr:
174 <        make -s glass_up.hdr
175 <        $(RDU_PFILT) glass_up.hdr > ref/glass_up.hdr
174 >        make   glass_up.hdr
175 >        $(RDU_PFILT)   glass_up.hdr > ref/glass_up.hdr
176  
177 < glass_up.hdr:   glass.rif
178 <        rad -v up glass.rif
177 > glass_up.hdr:   glass.oct
178 >        rad -v    up   glass.rif
179  
180 < ### End glass-up tests
180 > ### End   glass-up    tests
181  
182 < ### Reference and test for inst view def ###
182 > ### Octree for    inst ###
183  
184 < test-inst-def:  ref/inst_def.hdr inst_def.hdr
185 <        $(RDU_PFILT) inst_def.hdr | $(IMG_CMP) ref/inst_def.hdr -
184 > inst.oct:       inst.rif
185 >        rad -v 0    inst.rif
186  
187 + ### Reference and test for    inst view   def ###
188 +
189 + test-inst-def:  ref/inst_def.hdr    inst_def.hdr
190 +        $(RDU_PFILT)    inst_def.hdr | $(IMG_CMP) ref/inst_def.hdr -
191 +
192   ref/inst_def.hdr:
193 <        make -s inst_def.hdr
194 <        $(RDU_PFILT) inst_def.hdr > ref/inst_def.hdr
193 >        make    inst_def.hdr
194 >        $(RDU_PFILT)    inst_def.hdr > ref/inst_def.hdr
195  
196 < inst_def.hdr:   inst.rif
197 <        rad -v def inst.rif
196 > inst_def.hdr:   inst.oct
197 >        rad -v   def    inst.rif
198  
199 < ### End inst-def tests
199 > ### End    inst-def   tests
200  
201 < ### Reference and test for inst view fish ###
201 > ### Reference and test for    inst view  fish ###
202  
203 < test-inst-fish: ref/inst_fish.hdr inst_fish.hdr
204 <        $(RDU_PFILT) inst_fish.hdr | $(IMG_CMP) ref/inst_fish.hdr -
203 > test-inst-fish: ref/inst_fish.hdr    inst_fish.hdr
204 >        $(RDU_PFILT)    inst_fish.hdr | $(IMG_CMP) ref/inst_fish.hdr -
205  
206   ref/inst_fish.hdr:
207 <        make -s inst_fish.hdr
208 <        $(RDU_PFILT) inst_fish.hdr > ref/inst_fish.hdr
207 >        make    inst_fish.hdr
208 >        $(RDU_PFILT)    inst_fish.hdr > ref/inst_fish.hdr
209  
210 < inst_fish.hdr:  inst.rif
211 <        rad -v fish inst.rif
210 > inst_fish.hdr:  inst.oct
211 >        rad -v  fish    inst.rif
212  
213 < ### End inst-fish tests
213 > ### End    inst-fish  tests
214  
215 < ### Reference and test for mesh view def ###
215 > ### Octree for    mesh ###
216  
217 < test-mesh-def:  ref/mesh_def.hdr mesh_def.hdr
218 <        $(RDU_PFILT) mesh_def.hdr | $(IMG_CMP) ref/mesh_def.hdr -
217 > mesh.oct:       mesh.rif
218 >        rad -v 0    mesh.rif
219  
220 + ### Reference and test for    mesh view   def ###
221 +
222 + test-mesh-def:  ref/mesh_def.hdr    mesh_def.hdr
223 +        $(RDU_PFILT)    mesh_def.hdr | $(IMG_CMP) ref/mesh_def.hdr -
224 +
225   ref/mesh_def.hdr:
226 <        make -s mesh_def.hdr
227 <        $(RDU_PFILT) mesh_def.hdr > ref/mesh_def.hdr
226 >        make    mesh_def.hdr
227 >        $(RDU_PFILT)    mesh_def.hdr > ref/mesh_def.hdr
228  
229 < mesh_def.hdr:   mesh.rif
230 <        rad -v def mesh.rif
229 > mesh_def.hdr:   mesh.oct
230 >        rad -v   def    mesh.rif
231  
232 < ### End mesh-def tests
232 > ### End    mesh-def   tests
233  
234 < ### Reference and test for mesh view cyl ###
234 > ### Reference and test for    mesh view   cyl ###
235  
236 < test-mesh-cyl:  ref/mesh_cyl.hdr mesh_cyl.hdr
237 <        $(RDU_PFILT) mesh_cyl.hdr | $(IMG_CMP) ref/mesh_cyl.hdr -
236 > test-mesh-cyl:  ref/mesh_cyl.hdr    mesh_cyl.hdr
237 >        $(RDU_PFILT)    mesh_cyl.hdr | $(IMG_CMP) ref/mesh_cyl.hdr -
238  
239   ref/mesh_cyl.hdr:
240 <        make -s mesh_cyl.hdr
241 <        $(RDU_PFILT) mesh_cyl.hdr > ref/mesh_cyl.hdr
240 >        make    mesh_cyl.hdr
241 >        $(RDU_PFILT)    mesh_cyl.hdr > ref/mesh_cyl.hdr
242  
243 < mesh_cyl.hdr:   mesh.rif
244 <        rad -v cyl mesh.rif
243 > mesh_cyl.hdr:   mesh.oct
244 >        rad -v   cyl    mesh.rif
245  
246 < ### End mesh-cyl tests
246 > ### End    mesh-cyl   tests
247  
248 < ### Reference and test for mesh view cyl2 ###
248 > ### Reference and test for    mesh view  cyl2 ###
249  
250 < test-mesh-cyl2: ref/mesh_cyl2.hdr mesh_cyl2.hdr
251 <        $(RDU_PFILT) mesh_cyl2.hdr | $(IMG_CMP) ref/mesh_cyl2.hdr -
250 > test-mesh-cyl2: ref/mesh_cyl2.hdr    mesh_cyl2.hdr
251 >        $(RDU_PFILT)    mesh_cyl2.hdr | $(IMG_CMP) ref/mesh_cyl2.hdr -
252  
253   ref/mesh_cyl2.hdr:
254 <        make -s mesh_cyl2.hdr
255 <        $(RDU_PFILT) mesh_cyl2.hdr > ref/mesh_cyl2.hdr
254 >        make    mesh_cyl2.hdr
255 >        $(RDU_PFILT)    mesh_cyl2.hdr > ref/mesh_cyl2.hdr
256  
257 < mesh_cyl2.hdr:  mesh.rif
258 <        rad -v cyl2 mesh.rif
257 > mesh_cyl2.hdr:  mesh.oct
258 >        rad -v  cyl2    mesh.rif
259  
260 < ### End mesh-cyl2 tests
260 > ### End    mesh-cyl2  tests
261  
262 < ### Reference and test for mirror view fish ###
262 > ### Octree for  mirror ###
263  
264 < test-mirror-fish:       ref/mirror_fish.hdr mirror_fish.hdr
265 <        $(RDU_PFILT) mirror_fish.hdr | $(IMG_CMP) ref/mirror_fish.hdr -
264 > mirror.oct:     mirror.rif
265 >        rad -v 0  mirror.rif
266  
267 + ### Reference and test for  mirror view  fish ###
268 +
269 + test-mirror-fish:       ref/mirror_fish.hdr  mirror_fish.hdr
270 +        $(RDU_PFILT)  mirror_fish.hdr | $(IMG_CMP) ref/mirror_fish.hdr -
271 +
272   ref/mirror_fish.hdr:
273 <        make -s mirror_fish.hdr
274 <        $(RDU_PFILT) mirror_fish.hdr > ref/mirror_fish.hdr
273 >        make  mirror_fish.hdr
274 >        $(RDU_PFILT)  mirror_fish.hdr > ref/mirror_fish.hdr
275  
276 < mirror_fish.hdr:        mirror.rif
277 <        rad -v fish mirror.rif
276 > mirror_fish.hdr:        mirror.oct
277 >        rad -v  fish  mirror.rif
278  
279 < ### End mirror-fish tests
279 > ### End  mirror-fish  tests
280  
281 < ### Reference and test for mist view def ###
281 > ### Reference and test for    mist view   def ###
282  
283 < test-mist-def:  ref/mist_def.hdr mist_def.hdr
284 <        $(RDU_PFILT) mist_def.hdr | $(IMG_CMP) ref/mist_def.hdr -
283 > test-mist-def:  ref/mist_def.hdr    mist_def.hdr
284 >        $(RDU_PFILT)    mist_def.hdr | $(IMG_CMP) ref/mist_def.hdr -
285  
286   ref/mist_def.hdr:
287 <        make -s mist_def.hdr
288 <        $(RDU_PFILT) mist_def.hdr > ref/mist_def.hdr
287 >        make    mist_def.hdr
288 >        $(RDU_PFILT)    mist_def.hdr > ref/mist_def.hdr
289  
290   mist_def.hdr:   mist.rif
291 <        rad -v def mist.rif
291 >        rad -N $(NPROC) mist.rif
292  
293 < ### End mist-def tests
293 > ### End    mist-def   tests
294  
295 < ### Reference and test for prism1 view fish ###
295 > ### Octree for  prism1 ###
296  
297 < test-prism1-fish:       ref/prism1_fish.hdr prism1_fish.hdr
298 <        $(RDU_PFILT) prism1_fish.hdr | $(IMG_CMP) ref/prism1_fish.hdr -
297 > prism1.oct:     prism1.rif
298 >        rad -v 0  prism1.rif
299  
300 + ### Reference and test for  prism1 view  fish ###
301 +
302 + test-prism1-fish:       ref/prism1_fish.hdr  prism1_fish.hdr
303 +        $(RDU_PFILT)  prism1_fish.hdr | $(IMG_CMP) ref/prism1_fish.hdr -
304 +
305   ref/prism1_fish.hdr:
306 <        make -s prism1_fish.hdr
307 <        $(RDU_PFILT) prism1_fish.hdr > ref/prism1_fish.hdr
306 >        make  prism1_fish.hdr
307 >        $(RDU_PFILT)  prism1_fish.hdr > ref/prism1_fish.hdr
308  
309 < prism1_fish.hdr:        prism1.rif
310 <        rad -v fish prism1.rif
309 > prism1_fish.hdr:        prism1.oct
310 >        rad -v  fish  prism1.rif
311  
312 < ### End prism1-fish tests
312 > ### End  prism1-fish  tests
313  
314 < ### Reference and test for prism2 view fish ###
314 > ### Octree for  prism2 ###
315  
316 < test-prism2-fish:       ref/prism2_fish.hdr prism2_fish.hdr
317 <        $(RDU_PFILT) prism2_fish.hdr | $(IMG_CMP) ref/prism2_fish.hdr -
316 > prism2.oct:     prism2.rif
317 >        rad -v 0  prism2.rif
318  
319 + ### Reference and test for  prism2 view  fish ###
320 +
321 + test-prism2-fish:       ref/prism2_fish.hdr  prism2_fish.hdr
322 +        $(RDU_PFILT)  prism2_fish.hdr | $(IMG_CMP) ref/prism2_fish.hdr -
323 +
324   ref/prism2_fish.hdr:
325 <        make -s prism2_fish.hdr
326 <        $(RDU_PFILT) prism2_fish.hdr > ref/prism2_fish.hdr
325 >        make  prism2_fish.hdr
326 >        $(RDU_PFILT)  prism2_fish.hdr > ref/prism2_fish.hdr
327  
328 < prism2_fish.hdr:        prism2.rif
329 <        rad -v fish prism2.rif
328 > prism2_fish.hdr:        prism2.oct
329 >        rad -v  fish  prism2.rif
330  
331 < ### End prism2-fish tests
331 > ### End  prism2-fish  tests
332  
333 < ### Reference and test for tfunc view def ###
333 > ### Octree for   tfunc ###
334  
335 < test-tfunc-def: ref/tfunc_def.hdr tfunc_def.hdr
336 <        $(RDU_PFILT) tfunc_def.hdr | $(IMG_CMP) ref/tfunc_def.hdr -
335 > tfunc1.oct:     tfunc.rif
336 >        rad -v 0   tfunc.rif
337  
338 + ### Reference and test for   tfunc view   def ###
339 +
340 + test-tfunc-def: ref/tfunc_def.hdr   tfunc_def.hdr
341 +        $(RDU_PFILT)   tfunc_def.hdr | $(IMG_CMP) ref/tfunc_def.hdr -
342 +
343   ref/tfunc_def.hdr:
344 <        make -s tfunc_def.hdr
345 <        $(RDU_PFILT) tfunc_def.hdr > ref/tfunc_def.hdr
344 >        make   tfunc_def.hdr
345 >        $(RDU_PFILT)   tfunc_def.hdr > ref/tfunc_def.hdr
346  
347 < tfunc_def.hdr:  tfunc.rif
348 <        rad -v def tfunc.rif
347 > tfunc_def.hdr:  tfunc1.oct
348 >        rad -v   def   tfunc.rif
349  
350 < ### End tfunc-def tests
350 > ### End   tfunc-def   tests
351  
352 < ### Reference and test for tfunc view fish ###
352 > ### Reference and test for   tfunc view  fish ###
353  
354 < test-tfunc-fish:        ref/tfunc_fish.hdr tfunc_fish.hdr
355 <        $(RDU_PFILT) tfunc_fish.hdr | $(IMG_CMP) ref/tfunc_fish.hdr -
354 > test-tfunc-fish:        ref/tfunc_fish.hdr   tfunc_fish.hdr
355 >        $(RDU_PFILT)   tfunc_fish.hdr | $(IMG_CMP) ref/tfunc_fish.hdr -
356  
357   ref/tfunc_fish.hdr:
358 <        make -s tfunc_fish.hdr
359 <        $(RDU_PFILT) tfunc_fish.hdr > ref/tfunc_fish.hdr
358 >        make   tfunc_fish.hdr
359 >        $(RDU_PFILT)   tfunc_fish.hdr > ref/tfunc_fish.hdr
360  
361 < tfunc_fish.hdr: tfunc.rif
362 <        rad -v fish tfunc.rif
361 > tfunc_fish.hdr: tfunc1.oct
362 >        rad -v  fish   tfunc.rif
363  
364 < ### End tfunc-fish tests
364 > ### End   tfunc-fish  tests
365  
366 < ### Reference and test for trans view def ###
366 > ### Octree for   trans ###
367  
368 < test-trans-def: ref/trans_def.hdr trans_def.hdr
369 <        $(RDU_PFILT) trans_def.hdr | $(IMG_CMP) ref/trans_def.hdr -
368 > trans.oct:      trans.rif
369 >        rad -v 0   trans.rif
370  
371 + ### Reference and test for   trans view   def ###
372 +
373 + test-trans-def: ref/trans_def.hdr   trans_def.hdr
374 +        $(RDU_PFILT)   trans_def.hdr | $(IMG_CMP) ref/trans_def.hdr -
375 +
376   ref/trans_def.hdr:
377 <        make -s trans_def.hdr
378 <        $(RDU_PFILT) trans_def.hdr > ref/trans_def.hdr
377 >        make   trans_def.hdr
378 >        $(RDU_PFILT)   trans_def.hdr > ref/trans_def.hdr
379  
380 < trans_def.hdr:  trans.rif
381 <        rad -v def trans.rif
380 > trans_def.hdr:  trans.oct
381 >        rad -v   def   trans.rif
382  
383 < ### End trans-def tests
383 > ### End   trans-def   tests
384  
385 < ### Reference and test for trans view fish ###
385 > ### Reference and test for   trans view  fish ###
386  
387 < test-trans-fish:        ref/trans_fish.hdr trans_fish.hdr
388 <        $(RDU_PFILT) trans_fish.hdr | $(IMG_CMP) ref/trans_fish.hdr -
387 > test-trans-fish:        ref/trans_fish.hdr   trans_fish.hdr
388 >        $(RDU_PFILT)   trans_fish.hdr | $(IMG_CMP) ref/trans_fish.hdr -
389  
390   ref/trans_fish.hdr:
391 <        make -s trans_fish.hdr
392 <        $(RDU_PFILT) trans_fish.hdr > ref/trans_fish.hdr
391 >        make   trans_fish.hdr
392 >        $(RDU_PFILT)   trans_fish.hdr > ref/trans_fish.hdr
393  
394 < trans_fish.hdr: trans.rif
395 <        rad -v fish trans.rif
394 > trans_fish.hdr: trans.oct
395 >        rad -v  fish   trans.rif
396  
397 < ### End trans-fish tests
397 > ### End   trans-fish  tests
398  
399 < ### Reference and test for trans2 view def ###
399 > ### Octree for  trans2 ###
400  
401 < test-trans2-def:        ref/trans2_def.hdr trans2_def.hdr
402 <        $(RDU_PFILT) trans2_def.hdr | $(IMG_CMP) ref/trans2_def.hdr -
401 > trans21.oct:    trans2.rif
402 >        rad -v 0  trans2.rif
403  
404 + ### Reference and test for  trans2 view   def ###
405 +
406 + test-trans2-def:        ref/trans2_def.hdr  trans2_def.hdr
407 +        $(RDU_PFILT)  trans2_def.hdr | $(IMG_CMP) ref/trans2_def.hdr -
408 +
409   ref/trans2_def.hdr:
410 <        make -s trans2_def.hdr
411 <        $(RDU_PFILT) trans2_def.hdr > ref/trans2_def.hdr
410 >        make  trans2_def.hdr
411 >        $(RDU_PFILT)  trans2_def.hdr > ref/trans2_def.hdr
412  
413 < trans2_def.hdr: trans2.rif
414 <        rad -v def trans2.rif
413 > trans2_def.hdr: trans21.oct
414 >        rad -v   def  trans2.rif
415  
416 < ### End trans2-def tests
416 > ### End  trans2-def   tests
417  
418 < ### Reference and test for trans2 view fish ###
418 > ### Reference and test for  trans2 view  fish ###
419  
420 < test-trans2-fish:       ref/trans2_fish.hdr trans2_fish.hdr
421 <        $(RDU_PFILT) trans2_fish.hdr | $(IMG_CMP) ref/trans2_fish.hdr -
420 > test-trans2-fish:       ref/trans2_fish.hdr  trans2_fish.hdr
421 >        $(RDU_PFILT)  trans2_fish.hdr | $(IMG_CMP) ref/trans2_fish.hdr -
422  
423   ref/trans2_fish.hdr:
424 <        make -s trans2_fish.hdr
425 <        $(RDU_PFILT) trans2_fish.hdr > ref/trans2_fish.hdr
424 >        make  trans2_fish.hdr
425 >        $(RDU_PFILT)  trans2_fish.hdr > ref/trans2_fish.hdr
426  
427 < trans2_fish.hdr:        trans2.rif
428 <        rad -v fish trans2.rif
427 > trans2_fish.hdr:        trans21.oct
428 >        rad -v  fish  trans2.rif
429  
430 < ### End trans2-fish tests
430 > ### End  trans2-fish  tests
431  
432 < ### Reference and test for trans2 view win ###
432 > ### Reference and test for  trans2 view   win ###
433  
434 < test-trans2-win:        ref/trans2_win.hdr trans2_win.hdr
435 <        $(RDU_PFILT) trans2_win.hdr | $(IMG_CMP) ref/trans2_win.hdr -
434 > test-trans2-win:        ref/trans2_win.hdr  trans2_win.hdr
435 >        $(RDU_PFILT)  trans2_win.hdr | $(IMG_CMP) ref/trans2_win.hdr -
436  
437   ref/trans2_win.hdr:
438 <        make -s trans2_win.hdr
439 <        $(RDU_PFILT) trans2_win.hdr > ref/trans2_win.hdr
438 >        make  trans2_win.hdr
439 >        $(RDU_PFILT)  trans2_win.hdr > ref/trans2_win.hdr
440  
441 < trans2_win.hdr: trans2.rif
442 <        rad -v win trans2.rif
441 > trans2_win.hdr: trans21.oct
442 >        rad -v   win  trans2.rif
443  
444 < ### End trans2-win tests
444 > ### End  trans2-win   tests
445 >
446 > ### Octree for patterns ###
447 >
448 > patterns.oct:   patterns.rif
449 >        rad -v 0 patterns.rif
450 >
451 > ### Reference and test for patterns view   def ###
452 >
453 > test-patterns-def:      ref/patterns_def.hdr patterns_def.hdr
454 >        $(RDU_PFILT) patterns_def.hdr | $(IMG_CMP) ref/patterns_def.hdr -
455 >
456 > ref/patterns_def.hdr:
457 >        make patterns_def.hdr
458 >        $(RDU_PFILT) patterns_def.hdr > ref/patterns_def.hdr
459 >
460 > patterns_def.hdr:       patterns.oct
461 >        rad -v   def patterns.rif
462 >
463 > ### End patterns-def   tests
464 >
465 > ### Reference and test for patterns view   plan ###
466 >
467 > test-patterns-plan:     ref/patterns_plan.hdr patterns_plan.hdr
468 >        $(RDU_PFILT) patterns_plan.hdr | $(IMG_CMP) ref/patterns_plan.hdr -
469 >
470 > ref/patterns_plan.hdr:
471 >        make patterns_plan.hdr
472 >        $(RDU_PFILT) patterns_plan.hdr > ref/patterns_plan.hdr
473 >
474 > patterns_plan.hdr:      patterns.oct
475 >        rad -v   plan patterns.rif
476 >
477 > ### End patterns-plan   tests
478 >
479 > ### Octree for  mixtex ###
480 >
481 > mixtex.oct:     mixtex.rif
482 >        rad -v 0 -N $(NPROC) mixtex.rif
483 >
484 > ### Reference and test for  mixtex view   def ###
485 >
486 > test-mixtex-def:        ref/mixtex_def.hdr  mixtex_def.hdr
487 >        $(RDU_PFILT)  mixtex_def.hdr | $(IMG_CMP) ref/mixtex_def.hdr -
488 >
489 > ref/mixtex_def.hdr:
490 >        make  mixtex_def.hdr
491 >        $(RDU_PFILT)  mixtex_def.hdr > ref/mixtex_def.hdr
492 >
493 > mixtex_def.hdr: mixtex.oct
494 >        rad -v def -N $(NPROC) mixtex.rif
495 >
496 > ### End  mixtex-def   tests
497 >
498 > ### Reference and test for  mixtex view  fish ###
499 >
500 > test-mixtex-fish:       ref/mixtex_fish.hdr  mixtex_fish.hdr
501 >        $(RDU_PFILT)  mixtex_fish.hdr | $(IMG_CMP) ref/mixtex_fish.hdr -
502 >
503 > ref/mixtex_fish.hdr:
504 >        make  mixtex_fish.hdr
505 >        $(RDU_PFILT)  mixtex_fish.hdr > ref/mixtex_fish.hdr
506 >
507 > mixtex_fish.hdr:        mixtex.oct
508 >        rad -v  fish  mixtex.rif
509 >
510 > ### End  mixtex-fish  tests
511 >
512 > ### Reference and test for  mixtex view  plan ###
513 >
514 > test-mixtex-plan:       ref/mixtex_plan.hdr  mixtex_plan.hdr
515 >        $(RDU_PFILT)  mixtex_plan.hdr | $(IMG_CMP) ref/mixtex_plan.hdr -
516 >
517 > ref/mixtex_plan.hdr:
518 >        make  mixtex_plan.hdr
519 >        $(RDU_PFILT)  mixtex_plan.hdr > ref/mixtex_plan.hdr
520 >
521 > mixtex_plan.hdr:        mixtex.oct
522 >        rad -v  plan  mixtex.rif
523 >
524 > ### End  mixtex-plan  tests
525 >
526 > ### Reference and test for  mixtex view rplan ###
527 >
528 > test-mixtex-rplan:      ref/mixtex_rplan.hdr  mixtex_rplan.hdr
529 >        $(RDU_PFILT)  mixtex_rplan.hdr | $(IMG_CMP) ref/mixtex_rplan.hdr -
530 >
531 > ref/mixtex_rplan.hdr:
532 >        make  mixtex_rplan.hdr
533 >        $(RDU_PFILT)  mixtex_rplan.hdr > ref/mixtex_rplan.hdr
534 >
535 > mixtex_rplan.hdr:       mixtex.oct
536 >        rad -v rplan  mixtex.rif
537 >
538 > ### End  mixtex-rplan tests
539 >
540 > ### Octree for spectra
541 >
542 > spectra.oct:    spectra.rif
543 >        rad -v 0 spectra.rif
544 >
545 > ### Reference and test for spectra fish ###
546 >
547 > test-spectra-fish:      ref/spectra_fish.hdr spectra_fish.hdr
548 >        $(RDU_PFILT) spectra_fish.hdr | $(IMG_CMP) ref/spectra_fish.hdr -
549 >
550 > ref/spectra_fish.hdr:
551 >        make spectra_fish.hdr
552 >        $(RDU_PFILT) spectra_fish.hdr > ref/spectra_fish.hdr
553 >
554 > spectra_fish.hdr:       spectra.oct
555 >        rad -v fish spectra.rif
556 >
557 > ### End spectra-fish tests

Diff Legend

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