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'); |
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; |
138 |
|
##################################################################### |
139 |
|
##### Generating picture with depth buffer? |
140 |
|
if (defined $outzbf) { |
141 |
< |
exec "@vwraysA | @rtraceA -fff -olv @res $oct | " . |
142 |
< |
"rsplit -ih -iH -f " . |
143 |
< |
"-of $outzbf " . |
144 |
< |
"-oh -oH -of3 '!pvalue -r -df' | " . |
145 |
< |
"getinfo -a 'VIEW=$view'"; |
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 |
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"; |