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.2 by greg, Sat Nov 17 23:22:43 2018 UTC vs.
Revision 1.34 by greg, Fri Feb 19 06:01:46 2021 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 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-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-mesh-cyl2 test-mirror-fish test-mist-def \
27 > test-trans-def test-trans-fish test-patterns-def test-patterns-plan \
28 > test-rtrace test-obj2mesh
29  
30   clean:
31 <        rm -f *.oct *.amb *.dat *_*.hdr *.unf
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 < ### Reference and test for dielectric view def ###
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-fish
52 +
53 + test-rpiece test-mkpmap:        test-mixtex-def
54 +
55 + ### Special test of xform ###
56 +
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.oct
66 +        rad -n -s -e inst.rif > inst_rad.txt
67 +        radcompare ref/inst_rad.txt inst_rad.txt
68 +
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
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 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 -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
96 +        rfluxmtx -n $(NPROC) -ab 2 -lw 1e-4 mirror.rad dummysky.rad \
97 + basic.mat diorama_walls.rad closed_end.rad front_cap.rad \
98 + glass_pane.rad antimatter_portal.rad > rfmirror.mtx
99 +
100 + ### Octree for dielectric ###
101 +
102 + dielectric.oct: dielectric.rif
103 +        rad -v 0 dielectric.rif
104 +
105 + ### Reference and test for dielectric view   def ###
106 +
107   test-dielectric-def:    ref/dielectric_def.hdr dielectric_def.hdr
108          $(RDU_PFILT) dielectric_def.hdr | $(IMG_CMP) ref/dielectric_def.hdr -
109  
# Line 28 | Line 111 | ref/dielectric_def.hdr:
111          make dielectric_def.hdr
112          $(RDU_PFILT) dielectric_def.hdr > ref/dielectric_def.hdr
113  
114 < dielectric_def.hdr:     dielectric.rif
115 <        rad -v def dielectric.rif
114 > dielectric_def.hdr:     dielectric.oct
115 >        rad -v   def dielectric.rif
116  
117 < ### End dielectric-def tests
117 > ### End dielectric-def   tests
118  
119 < ### Reference and test for dielectric view fish ###
119 > ### Reference and test for dielectric view  fish ###
120  
121   test-dielectric-fish:   ref/dielectric_fish.hdr dielectric_fish.hdr
122          $(RDU_PFILT) dielectric_fish.hdr | $(IMG_CMP) ref/dielectric_fish.hdr -
# Line 42 | Line 125 | ref/dielectric_fish.hdr:
125          make dielectric_fish.hdr
126          $(RDU_PFILT) dielectric_fish.hdr > ref/dielectric_fish.hdr
127  
128 < dielectric_fish.hdr:    dielectric.rif
129 <        rad -v fish dielectric.rif
128 > dielectric_fish.hdr:    dielectric.oct
129 >        rad -v  fish dielectric.rif
130  
131 < ### End dielectric-fish tests
131 > ### End dielectric-fish  tests
132  
133 < ### Reference and test for glass view def ###
133 > ### Octree for   glass ###
134  
135 < test-glass-def: ref/glass_def.hdr glass_def.hdr
136 <        $(RDU_PFILT) glass_def.hdr | $(IMG_CMP) ref/glass_def.hdr -
135 > glass.oct:      glass.rif
136 >        rad -v 0   glass.rif
137  
138 + ### Reference and test for   glass view   def ###
139 +
140 + test-glass-def: ref/glass_def.hdr   glass_def.hdr
141 +        $(RDU_PFILT)   glass_def.hdr | $(IMG_CMP) ref/glass_def.hdr -
142 +
143   ref/glass_def.hdr:
144 <        make glass_def.hdr
145 <        $(RDU_PFILT) glass_def.hdr > ref/glass_def.hdr
144 >        make   glass_def.hdr
145 >        $(RDU_PFILT)   glass_def.hdr > ref/glass_def.hdr
146  
147 < glass_def.hdr:  glass.rif
148 <        rad -v def glass.rif
147 > glass_def.hdr:  glass.oct
148 >        rad -v   def   glass.rif
149  
150 < ### End glass-def tests
150 > ### End   glass-def   tests
151  
152 < ### Reference and test for glass view fish ###
152 > ### Reference and test for   glass view  fish ###
153  
154 < test-glass-fish:        ref/glass_fish.hdr glass_fish.hdr
155 <        $(RDU_PFILT) glass_fish.hdr | $(IMG_CMP) ref/glass_fish.hdr -
154 > test-glass-fish:        ref/glass_fish.hdr   glass_fish.hdr
155 >        $(RDU_PFILT)   glass_fish.hdr | $(IMG_CMP) ref/glass_fish.hdr -
156  
157   ref/glass_fish.hdr:
158 <        make glass_fish.hdr
159 <        $(RDU_PFILT) glass_fish.hdr > ref/glass_fish.hdr
158 >        make   glass_fish.hdr
159 >        $(RDU_PFILT)   glass_fish.hdr > ref/glass_fish.hdr
160  
161 < glass_fish.hdr: glass.rif
162 <        rad -v fish glass.rif
161 > glass_fish.hdr: glass.oct
162 >        rad -v  fish   glass.rif
163  
164 < ### End glass-fish tests
164 > ### End   glass-fish  tests
165  
166 < ### Reference and test for glass view up ###
166 > ### Reference and test for   glass view    up ###
167  
168 < test-glass-up:  ref/glass_up.hdr glass_up.hdr
169 <        $(RDU_PFILT) glass_up.hdr | $(IMG_CMP) ref/glass_up.hdr -
168 > test-glass-up:  ref/glass_up.hdr   glass_up.hdr
169 >        $(RDU_PFILT)   glass_up.hdr | $(IMG_CMP) ref/glass_up.hdr -
170  
171   ref/glass_up.hdr:
172 <        make glass_up.hdr
173 <        $(RDU_PFILT) glass_up.hdr > ref/glass_up.hdr
172 >        make   glass_up.hdr
173 >        $(RDU_PFILT)   glass_up.hdr > ref/glass_up.hdr
174  
175 < glass_up.hdr:   glass.rif
176 <        rad -v up glass.rif
175 > glass_up.hdr:   glass.oct
176 >        rad -v    up   glass.rif
177  
178 < ### End glass-up tests
178 > ### End   glass-up    tests
179  
180 < ### Reference and test for inst view def ###
180 > ### Octree for    inst ###
181  
182 < test-inst-def:  ref/inst_def.hdr inst_def.hdr
183 <        $(RDU_PFILT) inst_def.hdr | $(IMG_CMP) ref/inst_def.hdr -
182 > inst.oct:       inst.rif
183 >        rad -v 0    inst.rif
184  
185 + ### Reference and test for    inst view   def ###
186 +
187 + test-inst-def:  ref/inst_def.hdr    inst_def.hdr
188 +        $(RDU_PFILT)    inst_def.hdr | $(IMG_CMP) ref/inst_def.hdr -
189 +
190   ref/inst_def.hdr:
191 <        make inst_def.hdr
192 <        $(RDU_PFILT) inst_def.hdr > ref/inst_def.hdr
191 >        make    inst_def.hdr
192 >        $(RDU_PFILT)    inst_def.hdr > ref/inst_def.hdr
193  
194 < inst_def.hdr:   inst.rif
195 <        rad -v def inst.rif
194 > inst_def.hdr:   inst.oct
195 >        rad -v   def    inst.rif
196  
197 < ### End inst-def tests
197 > ### End    inst-def   tests
198  
199 < ### Reference and test for inst view fish ###
199 > ### Reference and test for    inst view  fish ###
200  
201 < test-inst-fish: ref/inst_fish.hdr inst_fish.hdr
202 <        $(RDU_PFILT) inst_fish.hdr | $(IMG_CMP) ref/inst_fish.hdr -
201 > test-inst-fish: ref/inst_fish.hdr    inst_fish.hdr
202 >        $(RDU_PFILT)    inst_fish.hdr | $(IMG_CMP) ref/inst_fish.hdr -
203  
204   ref/inst_fish.hdr:
205 <        make inst_fish.hdr
206 <        $(RDU_PFILT) inst_fish.hdr > ref/inst_fish.hdr
205 >        make    inst_fish.hdr
206 >        $(RDU_PFILT)    inst_fish.hdr > ref/inst_fish.hdr
207  
208 < inst_fish.hdr:  inst.rif
209 <        rad -v fish inst.rif
208 > inst_fish.hdr:  inst.oct
209 >        rad -v  fish    inst.rif
210  
211 < ### End inst-fish tests
211 > ### End    inst-fish  tests
212  
213 < ### Reference and test for mesh view def ###
213 > ### Octree for    mesh ###
214  
215 < test-mesh-def:  ref/mesh_def.hdr mesh_def.hdr
216 <        $(RDU_PFILT) mesh_def.hdr | $(IMG_CMP) ref/mesh_def.hdr -
215 > mesh.oct:       mesh.rif
216 >        rad -v 0    mesh.rif
217  
218 + ### Reference and test for    mesh view   def ###
219 +
220 + test-mesh-def:  ref/mesh_def.hdr    mesh_def.hdr
221 +        $(RDU_PFILT)    mesh_def.hdr | $(IMG_CMP) ref/mesh_def.hdr -
222 +
223   ref/mesh_def.hdr:
224 <        make mesh_def.hdr
225 <        $(RDU_PFILT) mesh_def.hdr > ref/mesh_def.hdr
224 >        make    mesh_def.hdr
225 >        $(RDU_PFILT)    mesh_def.hdr > ref/mesh_def.hdr
226  
227 < mesh_def.hdr:   mesh.rif
228 <        rad -v def mesh.rif
227 > mesh_def.hdr:   mesh.oct
228 >        rad -v   def    mesh.rif
229  
230 < ### End mesh-def tests
230 > ### End    mesh-def   tests
231  
232 < ### Reference and test for mesh view cyl ###
232 > ### Reference and test for    mesh view   cyl ###
233  
234 < test-mesh-cyl:  ref/mesh_cyl.hdr mesh_cyl.hdr
235 <        $(RDU_PFILT) mesh_cyl.hdr | $(IMG_CMP) ref/mesh_cyl.hdr -
234 > test-mesh-cyl:  ref/mesh_cyl.hdr    mesh_cyl.hdr
235 >        $(RDU_PFILT)    mesh_cyl.hdr | $(IMG_CMP) ref/mesh_cyl.hdr -
236  
237   ref/mesh_cyl.hdr:
238 <        make mesh_cyl.hdr
239 <        $(RDU_PFILT) mesh_cyl.hdr > ref/mesh_cyl.hdr
238 >        make    mesh_cyl.hdr
239 >        $(RDU_PFILT)    mesh_cyl.hdr > ref/mesh_cyl.hdr
240  
241 < mesh_cyl.hdr:   mesh.rif
242 <        rad -v cyl mesh.rif
241 > mesh_cyl.hdr:   mesh.oct
242 >        rad -v   cyl    mesh.rif
243  
244 < ### End mesh-cyl tests
244 > ### End    mesh-cyl   tests
245  
246 < ### Reference and test for mesh view cyl2 ###
246 > ### Reference and test for    mesh view  cyl2 ###
247  
248 < test-mesh-cyl2: ref/mesh_cyl2.hdr mesh_cyl2.hdr
249 <        $(RDU_PFILT) mesh_cyl2.hdr | $(IMG_CMP) ref/mesh_cyl2.hdr -
248 > test-mesh-cyl2: ref/mesh_cyl2.hdr    mesh_cyl2.hdr
249 >        $(RDU_PFILT)    mesh_cyl2.hdr | $(IMG_CMP) ref/mesh_cyl2.hdr -
250  
251   ref/mesh_cyl2.hdr:
252 <        make mesh_cyl2.hdr
253 <        $(RDU_PFILT) mesh_cyl2.hdr > ref/mesh_cyl2.hdr
252 >        make    mesh_cyl2.hdr
253 >        $(RDU_PFILT)    mesh_cyl2.hdr > ref/mesh_cyl2.hdr
254  
255 < mesh_cyl2.hdr:  mesh.rif
256 <        rad -v cyl2 mesh.rif
255 > mesh_cyl2.hdr:  mesh.oct
256 >        rad -v  cyl2    mesh.rif
257  
258 < ### End mesh-cyl2 tests
258 > ### End    mesh-cyl2  tests
259  
260 < ### Reference and test for mirror view fish ###
260 > ### Octree for  mirror ###
261  
262 < test-mirror-fish:       ref/mirror_fish.hdr mirror_fish.hdr
263 <        $(RDU_PFILT) mirror_fish.hdr | $(IMG_CMP) ref/mirror_fish.hdr -
262 > mirror.oct:     mirror.rif
263 >        rad -v 0  mirror.rif
264  
265 + ### Reference and test for  mirror view  fish ###
266 +
267 + test-mirror-fish:       ref/mirror_fish.hdr  mirror_fish.hdr
268 +        $(RDU_PFILT)  mirror_fish.hdr | $(IMG_CMP) ref/mirror_fish.hdr -
269 +
270   ref/mirror_fish.hdr:
271 <        make mirror_fish.hdr
272 <        $(RDU_PFILT) mirror_fish.hdr > ref/mirror_fish.hdr
271 >        make  mirror_fish.hdr
272 >        $(RDU_PFILT)  mirror_fish.hdr > ref/mirror_fish.hdr
273  
274 < mirror_fish.hdr:        mirror.rif
275 <        rad -v fish mirror.rif
274 > mirror_fish.hdr:        mirror.oct
275 >        rad -v  fish  mirror.rif
276  
277 < ### End mirror-fish tests
277 > ### End  mirror-fish  tests
278  
279 < ### Reference and test for mist view def ###
279 > ### Reference and test for    mist view   def ###
280  
281 < test-mist-def:  ref/mist_def.hdr mist_def.hdr
282 <        $(RDU_PFILT) mist_def.hdr | $(IMG_CMP) ref/mist_def.hdr -
281 > test-mist-def:  ref/mist_def.hdr    mist_def.hdr
282 >        $(RDU_PFILT)    mist_def.hdr | $(IMG_CMP) ref/mist_def.hdr -
283  
284   ref/mist_def.hdr:
285 <        make mist_def.hdr
286 <        $(RDU_PFILT) mist_def.hdr > ref/mist_def.hdr
285 >        make    mist_def.hdr
286 >        $(RDU_PFILT)    mist_def.hdr > ref/mist_def.hdr
287  
288   mist_def.hdr:   mist.rif
289 <        rad -v def mist.rif
289 >        rad -N $(NPROC) mist.rif
290  
291 < ### End mist-def tests
291 > ### End    mist-def   tests
292  
293 < ### Reference and test for prism1 view fish ###
293 > ### Octree for  prism1 ###
294  
295 < test-prism1-fish:       ref/prism1_fish.hdr prism1_fish.hdr
296 <        $(RDU_PFILT) prism1_fish.hdr | $(IMG_CMP) ref/prism1_fish.hdr -
295 > prism1.oct:     prism1.rif
296 >        rad -v 0  prism1.rif
297  
298 + ### Reference and test for  prism1 view  fish ###
299 +
300 + test-prism1-fish:       ref/prism1_fish.hdr  prism1_fish.hdr
301 +        $(RDU_PFILT)  prism1_fish.hdr | $(IMG_CMP) ref/prism1_fish.hdr -
302 +
303   ref/prism1_fish.hdr:
304 <        make prism1_fish.hdr
305 <        $(RDU_PFILT) prism1_fish.hdr > ref/prism1_fish.hdr
304 >        make  prism1_fish.hdr
305 >        $(RDU_PFILT)  prism1_fish.hdr > ref/prism1_fish.hdr
306  
307 < prism1_fish.hdr:        prism1.rif
308 <        rad -v fish prism1.rif
307 > prism1_fish.hdr:        prism1.oct
308 >        rad -v  fish  prism1.rif
309  
310 < ### End prism1-fish tests
310 > ### End  prism1-fish  tests
311  
312 < ### Reference and test for prism2 view fish ###
312 > ### Octree for  prism2 ###
313  
314 < test-prism2-fish:       ref/prism2_fish.hdr prism2_fish.hdr
315 <        $(RDU_PFILT) prism2_fish.hdr | $(IMG_CMP) ref/prism2_fish.hdr -
314 > prism2.oct:     prism2.rif
315 >        rad -v 0  prism2.rif
316  
317 + ### Reference and test for  prism2 view  fish ###
318 +
319 + test-prism2-fish:       ref/prism2_fish.hdr  prism2_fish.hdr
320 +        $(RDU_PFILT)  prism2_fish.hdr | $(IMG_CMP) ref/prism2_fish.hdr -
321 +
322   ref/prism2_fish.hdr:
323 <        make prism2_fish.hdr
324 <        $(RDU_PFILT) prism2_fish.hdr > ref/prism2_fish.hdr
323 >        make  prism2_fish.hdr
324 >        $(RDU_PFILT)  prism2_fish.hdr > ref/prism2_fish.hdr
325  
326 < prism2_fish.hdr:        prism2.rif
327 <        rad -v fish prism2.rif
326 > prism2_fish.hdr:        prism2.oct
327 >        rad -v  fish  prism2.rif
328  
329 < ### End prism2-fish tests
329 > ### End  prism2-fish  tests
330  
331 < ### Reference and test for tfunc view def ###
331 > ### Octree for   tfunc ###
332  
333 < test-tfunc-def: ref/tfunc_def.hdr tfunc_def.hdr
334 <        $(RDU_PFILT) tfunc_def.hdr | $(IMG_CMP) ref/tfunc_def.hdr -
333 > tfunc1.oct:     tfunc.rif
334 >        rad -v 0   tfunc.rif
335  
336 + ### Reference and test for   tfunc view   def ###
337 +
338 + test-tfunc-def: ref/tfunc_def.hdr   tfunc_def.hdr
339 +        $(RDU_PFILT)   tfunc_def.hdr | $(IMG_CMP) ref/tfunc_def.hdr -
340 +
341   ref/tfunc_def.hdr:
342 <        make tfunc_def.hdr
343 <        $(RDU_PFILT) tfunc_def.hdr > 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.rif
346 <        rad -v def tfunc.rif
345 > tfunc_def.hdr:  tfunc1.oct
346 >        rad -v   def   tfunc.rif
347  
348 < ### End tfunc-def tests
348 > ### End   tfunc-def   tests
349  
350 < ### Reference and test for tfunc view fish ###
350 > ### Reference and test for   tfunc view  fish ###
351  
352 < test-tfunc-fish:        ref/tfunc_fish.hdr tfunc_fish.hdr
353 <        $(RDU_PFILT) tfunc_fish.hdr | $(IMG_CMP) ref/tfunc_fish.hdr -
352 > test-tfunc-fish:        ref/tfunc_fish.hdr   tfunc_fish.hdr
353 >        $(RDU_PFILT)   tfunc_fish.hdr | $(IMG_CMP) ref/tfunc_fish.hdr -
354  
355   ref/tfunc_fish.hdr:
356 <        make tfunc_fish.hdr
357 <        $(RDU_PFILT) tfunc_fish.hdr > 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.rif
360 <        rad -v fish tfunc.rif
359 > tfunc_fish.hdr: tfunc1.oct
360 >        rad -v  fish   tfunc.rif
361  
362 < ### End tfunc-fish tests
362 > ### End   tfunc-fish  tests
363  
364 < ### Reference and test for trans view def ###
364 > ### Octree for   trans ###
365  
366 < test-trans-def: ref/trans_def.hdr trans_def.hdr
367 <        $(RDU_PFILT) trans_def.hdr | $(IMG_CMP) ref/trans_def.hdr -
366 > trans.oct:      trans.rif
367 >        rad -v 0   trans.rif
368  
369 + ### Reference and test for   trans view   def ###
370 +
371 + test-trans-def: ref/trans_def.hdr   trans_def.hdr
372 +        $(RDU_PFILT)   trans_def.hdr | $(IMG_CMP) ref/trans_def.hdr -
373 +
374   ref/trans_def.hdr:
375 <        make trans_def.hdr
376 <        $(RDU_PFILT) trans_def.hdr > ref/trans_def.hdr
375 >        make   trans_def.hdr
376 >        $(RDU_PFILT)   trans_def.hdr > ref/trans_def.hdr
377  
378 < trans_def.hdr:  trans.rif
379 <        rad -v def trans.rif
378 > trans_def.hdr:  trans.oct
379 >        rad -v   def   trans.rif
380  
381 < ### End trans-def tests
381 > ### End   trans-def   tests
382  
383 < ### Reference and test for trans view fish ###
383 > ### Reference and test for   trans view  fish ###
384  
385 < test-trans-fish:        ref/trans_fish.hdr trans_fish.hdr
386 <        $(RDU_PFILT) trans_fish.hdr | $(IMG_CMP) ref/trans_fish.hdr -
385 > test-trans-fish:        ref/trans_fish.hdr   trans_fish.hdr
386 >        $(RDU_PFILT)   trans_fish.hdr | $(IMG_CMP) ref/trans_fish.hdr -
387  
388   ref/trans_fish.hdr:
389 <        make trans_fish.hdr
390 <        $(RDU_PFILT) trans_fish.hdr > ref/trans_fish.hdr
389 >        make   trans_fish.hdr
390 >        $(RDU_PFILT)   trans_fish.hdr > ref/trans_fish.hdr
391  
392 < trans_fish.hdr: trans.rif
393 <        rad -v fish trans.rif
392 > trans_fish.hdr: trans.oct
393 >        rad -v  fish   trans.rif
394  
395 < ### End trans-fish tests
395 > ### End   trans-fish  tests
396  
397 < ### Reference and test for trans2 view def ###
397 > ### Octree for  trans2 ###
398  
399 < test-trans2-def:        ref/trans2_def.hdr trans2_def.hdr
400 <        $(RDU_PFILT) trans2_def.hdr | $(IMG_CMP) ref/trans2_def.hdr -
399 > trans21.oct:    trans2.rif
400 >        rad -v 0  trans2.rif
401  
402 + ### Reference and test for  trans2 view   def ###
403 +
404 + test-trans2-def:        ref/trans2_def.hdr  trans2_def.hdr
405 +        $(RDU_PFILT)  trans2_def.hdr | $(IMG_CMP) ref/trans2_def.hdr -
406 +
407   ref/trans2_def.hdr:
408 <        make trans2_def.hdr
409 <        $(RDU_PFILT) trans2_def.hdr > 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.rif
412 <        rad -v def trans2.rif
411 > trans2_def.hdr: trans21.oct
412 >        rad -v   def  trans2.rif
413  
414 < ### End trans2-def tests
414 > ### End  trans2-def   tests
415  
416 < ### Reference and test for trans2 view fish ###
416 > ### Reference and test for  trans2 view  fish ###
417  
418 < test-trans2-fish:       ref/trans2_fish.hdr trans2_fish.hdr
419 <        $(RDU_PFILT) trans2_fish.hdr | $(IMG_CMP) ref/trans2_fish.hdr -
418 > test-trans2-fish:       ref/trans2_fish.hdr  trans2_fish.hdr
419 >        $(RDU_PFILT)  trans2_fish.hdr | $(IMG_CMP) ref/trans2_fish.hdr -
420  
421   ref/trans2_fish.hdr:
422 <        make trans2_fish.hdr
423 <        $(RDU_PFILT) trans2_fish.hdr > 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.rif
426 <        rad -v fish trans2.rif
425 > trans2_fish.hdr:        trans21.oct
426 >        rad -v  fish  trans2.rif
427  
428 < ### End trans2-fish tests
428 > ### End  trans2-fish  tests
429  
430 < ### Reference and test for trans2 view win ###
430 > ### Reference and test for  trans2 view   win ###
431  
432 < test-trans2-win:        ref/trans2_win.hdr trans2_win.hdr
433 <        $(RDU_PFILT) trans2_win.hdr | $(IMG_CMP) ref/trans2_win.hdr -
432 > test-trans2-win:        ref/trans2_win.hdr  trans2_win.hdr
433 >        $(RDU_PFILT)  trans2_win.hdr | $(IMG_CMP) ref/trans2_win.hdr -
434  
435   ref/trans2_win.hdr:
436 <        make trans2_win.hdr
437 <        $(RDU_PFILT) trans2_win.hdr > 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.rif
440 <        rad -v win trans2.rif
439 > trans2_win.hdr: trans21.oct
440 >        rad -v   win  trans2.rif
441  
442 < ### End trans2-win tests
442 > ### End  trans2-win   tests
443 >
444 > ### Octree for patterns ###
445 >
446 > patterns.oct:   patterns.rif
447 >        rad -v 0 patterns.rif
448 >
449 > ### Reference and test for patterns view   def ###
450 >
451 > test-patterns-def:      ref/patterns_def.hdr patterns_def.hdr
452 >        $(RDU_PFILT) patterns_def.hdr | $(IMG_CMP) ref/patterns_def.hdr -
453 >
454 > ref/patterns_def.hdr:
455 >        make patterns_def.hdr
456 >        $(RDU_PFILT) patterns_def.hdr > ref/patterns_def.hdr
457 >
458 > patterns_def.hdr:       patterns.oct
459 >        rad -v   def patterns.rif
460 >
461 > ### End patterns-def   tests
462 >
463 > ### Reference and test for patterns view   plan ###
464 >
465 > test-patterns-plan:     ref/patterns_plan.hdr patterns_plan.hdr
466 >        $(RDU_PFILT) patterns_plan.hdr | $(IMG_CMP) ref/patterns_plan.hdr -
467 >
468 > ref/patterns_plan.hdr:
469 >        make patterns_plan.hdr
470 >        $(RDU_PFILT) patterns_plan.hdr > ref/patterns_plan.hdr
471 >
472 > patterns_plan.hdr:      patterns.oct
473 >        rad -v   plan patterns.rif
474 >
475 > ### End patterns-plan   tests
476 >
477 > ### Octree for  mixtex ###
478 >
479 > mixtex.oct:     mixtex.rif
480 >        rad -v 0 -N $(NPROC) mixtex.rif
481 >
482 > ### Reference and test for  mixtex view   def ###
483 >
484 > test-mixtex-def:        ref/mixtex_def.hdr  mixtex_def.hdr
485 >        $(RDU_PFILT)  mixtex_def.hdr | $(IMG_CMP) ref/mixtex_def.hdr -
486 >
487 > ref/mixtex_def.hdr:
488 >        make  mixtex_def.hdr
489 >        $(RDU_PFILT)  mixtex_def.hdr > ref/mixtex_def.hdr
490 >
491 > mixtex_def.hdr: mixtex.oct
492 >        rad -v def -N $(NPROC) mixtex.rif
493 >
494 > ### End  mixtex-def   tests
495 >
496 > ### Reference and test for  mixtex view  fish ###
497 >
498 > test-mixtex-fish:       ref/mixtex_fish.hdr  mixtex_fish.hdr
499 >        $(RDU_PFILT)  mixtex_fish.hdr | $(IMG_CMP) ref/mixtex_fish.hdr -
500 >
501 > ref/mixtex_fish.hdr:
502 >        make  mixtex_fish.hdr
503 >        $(RDU_PFILT)  mixtex_fish.hdr > ref/mixtex_fish.hdr
504 >
505 > mixtex_fish.hdr:        mixtex.oct
506 >        rad -v  fish  mixtex.rif
507 >
508 > ### End  mixtex-fish  tests
509 >
510 > ### Reference and test for  mixtex view  plan ###
511 >
512 > test-mixtex-plan:       ref/mixtex_plan.hdr  mixtex_plan.hdr
513 >        $(RDU_PFILT)  mixtex_plan.hdr | $(IMG_CMP) ref/mixtex_plan.hdr -
514 >
515 > ref/mixtex_plan.hdr:
516 >        make  mixtex_plan.hdr
517 >        $(RDU_PFILT)  mixtex_plan.hdr > ref/mixtex_plan.hdr
518 >
519 > mixtex_plan.hdr:        mixtex.oct
520 >        rad -v  plan  mixtex.rif
521 >
522 > ### End  mixtex-plan  tests
523 >
524 > ### Reference and test for  mixtex view rplan ###
525 >
526 > test-mixtex-rplan:      ref/mixtex_rplan.hdr  mixtex_rplan.hdr
527 >        $(RDU_PFILT)  mixtex_rplan.hdr | $(IMG_CMP) ref/mixtex_rplan.hdr -
528 >
529 > ref/mixtex_rplan.hdr:
530 >        make  mixtex_rplan.hdr
531 >        $(RDU_PFILT)  mixtex_rplan.hdr > ref/mixtex_rplan.hdr
532 >
533 > mixtex_rplan.hdr:       mixtex.oct
534 >        rad -v rplan  mixtex.rif
535 >
536 > ### End  mixtex-rplan tests

Diff Legend

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