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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines