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.13 by greg, Fri Dec 13 21:43:47 2019 UTC vs.
Revision 2.17 by greg, Wed Apr 8 02:39:30 2020 UTC

# Line 11 | Line 11 | use strict;
11   my $nprocs = 1;
12   # rtrace options and the associated number of arguments
13   my %rtraceC = ('-dt',1, '-dc',1, '-dj',1, '-ds',1, '-dr',1, '-dp',1,
14 <                '-ss',1, '-st',1, '-e',1, '-am',1,
14 >                '-ss',1, '-st',1, '-e',1, '-am',1, '-P',1, '-PP',1,
15                  '-ab',1, '-af',1, '-ai',1, '-aI',1, '-ae',1, '-aE',1,
16                  '-av',3, '-aw',1, '-aa',1, '-ar',1, '-ad',1, '-as',1,
17                  '-me',3, '-ma',3, '-mg',1, '-ms',1, '-lr',1, '-lw',1);
# 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 40 | Line 41 | OPTION:                                # sort through options
41   while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
42          # Check for file inclusion
43          if ("$ARGV[0]" =~ /^\@/) {
44 <                open my $handle, '<', substr($ARGV[0], 1);
44 >                open my $handle, '<', substr($ARGV[0], 1) or die "No file for $ARGV[0]\n";
45                  shift @ARGV;
46                  chomp(my @args = <$handle>);
47                  close $handle;
# 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   }
# Line 186 | Line 188 | if (! -d $outdir) {
188   foreach my $oval (split //, $outlyr) {
189          die "Duplicate or unsupported type '$oval' in -o$outlyr\n"
190                                          if (!defined $rtoutC{$oval});
191 +        my $outfile = "$outdir/$rtoutC{$oval}";
192 +        die "File '$outfile' already exists\n" if (-e $outfile);
193          my ($otyp) = ($rtoutC{$oval} =~ /(\.[^.]+)$/);
194          push @rsplitA, $rcodeC{$otyp}[0];
195 <        push @rsplitA, qq{'$rcodeC{$otyp}[1] > "$outdir/$rtoutC{$oval}"'};
195 >        push @rsplitA, qq{'$rcodeC{$otyp}[1] > "$outfile"'};
196          delete $rtoutC{$oval};
197   }
198                          # call rtrace + rsplit

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines