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.16 by greg, Wed Apr 8 00:58:32 2020 UTC vs.
Revision 2.17 by greg, Wed Apr 8 02:39:30 2020 UTC

# Line 28 | Line 28 | my @rtraceA = split(' ', 'rtrace -u- -dt .05 -dc .5 -d
28                                  '-aa .2 -ar 64 -ad 512 -as 128 -lr 7 -lw 1e-03');
29   my @vwraysA = ('vwrays', '-ff', '-pj', '.67');
30   my @vwrightA = ('vwright', '-vtv');
31 < my @rpictA = ('rpict');
31 > my @rpictA = ('rpict', '-ps', '1');
32   my $outpatt = '^-o[vrxlLRXnNsmM]+';
33   my $refDepth = "";
34   my $irrad = 0;
35 + my $persist = 0;
36   my $outlyr;
37   my $outdir;
38   my $outpic;
# Line 75 | Line 76 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
76          }
77          # Check rtrace options
78          if (defined $rtraceC{$ARGV[0]}) {
79 +                $persist ||= ("$ARGV[0]" =~ /^-PP?$/);
80                  push @rtraceA, $ARGV[0];
81                  push @rpictA, shift(@ARGV);
82                  for (my $i = $rtraceC{$rpictA[-1]}; $i-- > 0; ) {
# Line 124 | Line 126 | if (defined $outpic) {         # redirect output?
126   }
127   #####################################################################
128   ##### May as well run rpict?
129 < if ($nprocs == 1 && !defined($outdir)) {
129 > if ($nprocs == 1 && $persist == 0 && !defined($outdir)) {
130          push(@rpictA, $ARGV[0]) if ($#ARGV == 0);
131          exec @rpictA ;
132   }

Diff Legend

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