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.17 by greg, Mon Jan 7 21:11:24 2019 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines