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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines