ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/fieldcomb.csh
(Generate patch)

Comparing ray/src/util/fieldcomb.csh (file contents):
Revision 2.5 by greg, Mon Sep 5 16:13:08 2005 UTC vs.
Revision 2.6 by greg, Tue Sep 6 15:34:46 2005 UTC

# Line 34 | Line 34 | while ($#argv > 1)
34          endsw
35          shift argv
36   end
37 < if ($#argv < 2 || ($?outfile && $#argv > 2)) then
37 > if ($#argv < 2) then
38          echo "Usage: $0 [-e|-o][-r] [-f combined.pic] field1.pic field2.pic .."
39          exit 1
40   endif
41 + if ($?outfile && $#argv > 2) then
42 +        echo "Cannot use -f option with more than two input files"
43 +        exit 1
44 + endif
45   set f1=$argv[1]:q
46   set ext=$f1:e
47   set basenm="`echo $f1:q | sed 's/[0-9]*\.'$ext'//'`"
# Line 61 | Line 65 | while ($curfi < $#fields)
65                  set fid=$curfr
66          endif
67          set outf="${basenm}C$fid.$ext"
68 <        if ($?outfile) set outf=$outfile:q
68 >        if ($?outfile) then
69 >                set outf=$outfile:q
70 >        endif
71          pcomb -e 'ro=ri(fld); go=gi(fld); bo=bi(fld)' \
72                  -e 'yd=yres-1-y; odd=.5*yd-floor(.5*yd)-.25' \
73                  -e "fld=if(odd,2-$odd_first,1+$odd_first)" \

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines