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.10 by greg, Sat Dec 1 05:40:35 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines