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.12 by greg, Fri Aug 16 04:32:46 2019 UTC vs.
Revision 2.15 by greg, Sun Mar 15 16:54:19 2020 UTC

# 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 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 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
197 < exec "@vwraysA | @rtraceA -fff @res $oct | getinfo -a 'VIEW=$view' | @rsplitA";
197 > exec "@vwraysA | @rtraceA -fff @res '$oct' | getinfo -a 'VIEW=$view' | @rsplitA";

Diff Legend

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