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

Comparing ray/src/util/rtpict.pl (file contents):
Revision 2.11 by greg, Wed Aug 14 22:57:24 2019 UTC vs.
Revision 2.13 by greg, Fri Dec 13 21:43:47 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 138 | Line 138 | my @res = split(/\s/, `@vwraysA -d`);
138   #####################################################################
139   ##### Generating picture with depth buffer?
140   if (defined $outzbf) {
141 <        exec "@vwraysA | @rtraceA -fff -olv @res $oct | " .
142 <                "rsplit -ih -iH -f -of $outzbf -oh -oH -of3 - | " .
141 >        exec "@vwraysA | @rtraceA -fff -olv @res '$oct' | " .
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?
147   if (! defined $outdir) {
148 <        exec "@vwraysA | @rtraceA -ffc @res $oct | getinfo -a 'VIEW=$view'";
148 >        exec "@vwraysA | @rtraceA -ffc @res '$oct' | getinfo -a 'VIEW=$view'";
149   }
150   #####################################################################
151   ##### Layered image output case
# Line 192 | Line 192 | foreach my $oval (split //, $outlyr) {
192          delete $rtoutC{$oval};
193   }
194                          # call rtrace + rsplit
195 < exec "@vwraysA | @rtraceA -fff @res $oct | getinfo -a 'VIEW=$view' | @rsplitA";
195 > exec "@vwraysA | @rtraceA -fff @res '$oct' | getinfo -a 'VIEW=$view' | @rsplitA";

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)