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

Comparing ray/src/util/rtpict.pl (file contents):
Revision 2.9 by greg, Tue Jul 23 18:17:55 2019 UTC vs.
Revision 2.12 by greg, Fri Aug 16 04:32:46 2019 UTC

# Line 20 | Line 20 | my @boolO = ('-w', '-bv', '-dv', '-i', '-u');
20   # view options and the associated number of arguments
21   my %vwraysC = ('-vf',1, '-vtv',0, '-vtl',0, '-vth',0, '-vta',0, '-vts',0, '-vtc',0,
22                  '-x',1, '-y',1, '-vp',3, '-vd',3, '-vu',3, '-vh',1, '-vv',1,
23 <                '-vo',1, '-va',1, '-vs',1, '-vl',1, '-pa',1, '-pj',1, '-pd',1);
23 >                '-vo',1, '-va',1, '-vs',1, '-vl',1, '-pa',1, '-pj',1);
24   # options we need to silently ignore
25 < my %ignoreC = ('-t',1, '-ps',1, '-pt',1, '-pm',1);
25 > my %ignoreC = ('-t',1, '-ps',1, '-pt',1, '-pm',1, '-pd',1);
26   # Starting options for rtrace (rpict values)
27   my @rtraceA = split(' ', 'rtrace -u- -dt .05 -dc .5 -ds .25 -dr 1 ' .
28                                  '-aa .2 -ar 64 -ad 512 -as 128 -lr 7 -lw 1e-03');
# Line 139 | Line 139 | my @res = split(/\s/, `@vwraysA -d`);
139   ##### Generating picture with depth buffer?
140   if (defined $outzbf) {
141          exec "@vwraysA | @rtraceA -fff -olv @res $oct | " .
142 <                "rsplit -ih -iH -f " .
143 <                        "-of $outzbf " .
144 <                        "-oh -oH -of3 '!pvalue -r -df' | " .
145 <                "getinfo -a 'VIEW=$view'";
142 >                "rsplit -ih -iH -f -of $outzbf -oh -oH -of3 - | " .
143 >                "pvalue -r -df | getinfo -a 'VIEW=$view'";
144   }
145   #####################################################################
146   ##### Base case with output picture only?
# Line 155 | Line 153 | my @rsplitA = ("rsplit", "'-t  '", "-ih", "-iH", "-oh",
153   # Supported rtrace -o* options and output file name.typ
154   my %rtoutC = (
155          v =>    'radiance.hdr',
156 <        r =>    'mirrored.hdr',
157 <        x =>    'unmirrored.hdr',
158 <        l =>    'effective.dpt',
159 <        L =>    'firstsurface.dpt',
160 <        R =>    'mirrored.dpt',
161 <        X =>    'unmirrored.dpt',
156 >        r =>    'r_refl.hdr',
157 >        x =>    'r_unrefl.hdr',
158 >        l =>    'd_effective.dpt',
159 >        L =>    'd_firstsurf.dpt',
160 >        R =>    'd_refl.dpt',
161 >        X =>    'd_unrefl.dpt',
162          n =>    'perturbed.nrm',
163          N =>    'unperturbed.nrm',
164          s =>    'surface.idx',

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines