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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines