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

Diff Legend

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