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

Diff Legend

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