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.16 by greg, Wed Apr 8 00:58:32 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 40 | Line 40 | OPTION:                                # sort through options
40   while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
41          # Check for file inclusion
42          if ("$ARGV[0]" =~ /^\@/) {
43 <                open my $handle, '<', substr($ARGV[0], 1);
43 >                open my $handle, '<', substr($ARGV[0], 1) or die "No file for $ARGV[0]\n";
44                  shift @ARGV;
45                  chomp(my @args = <$handle>);
46                  close $handle;
# Line 186 | Line 186 | if (! -d $outdir) {
186   foreach my $oval (split //, $outlyr) {
187          die "Duplicate or unsupported type '$oval' in -o$outlyr\n"
188                                          if (!defined $rtoutC{$oval});
189 +        my $outfile = "$outdir/$rtoutC{$oval}";
190 +        die "File '$outfile' already exists\n" if (-e $outfile);
191          my ($otyp) = ($rtoutC{$oval} =~ /(\.[^.]+)$/);
192          push @rsplitA, $rcodeC{$otyp}[0];
193 <        push @rsplitA, qq{'$rcodeC{$otyp}[1] > "$outdir/$rtoutC{$oval}"'};
193 >        push @rsplitA, qq{'$rcodeC{$otyp}[1] > "$outfile"'};
194          delete $rtoutC{$oval};
195   }
196                          # call rtrace + rsplit

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines