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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines