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); |
17 |
> |
'-me',3, '-ma',3, '-mg',1, '-ms',1, '-lr',1, '-lw',1, |
18 |
> |
'-ap',2, '-am',1, '-ac',1, '-aC',1); |
19 |
|
# boolean rtrace options |
20 |
|
my @boolO = ('-w', '-bv', '-dv', '-i', '-u'); |
21 |
|
# view options and the associated number of arguments |
22 |
|
my %vwraysC = ('-vf',1, '-vtv',0, '-vtl',0, '-vth',0, '-vta',0, '-vts',0, '-vtc',0, |
23 |
|
'-x',1, '-y',1, '-vp',3, '-vd',3, '-vu',3, '-vh',1, '-vv',1, |
24 |
< |
'-vo',1, '-va',1, '-vs',1, '-vl',1, '-pa',1, '-pj',1); |
24 |
> |
'-vo',1, '-va',1, '-vs',1, '-vl',1, '-pa',1, '-pj',1, '-pd',1); |
25 |
|
# options we need to silently ignore |
26 |
< |
my %ignoreC = ('-t',1, '-ps',1, '-pt',1, '-pm',1, '-pd',1); |
26 |
> |
my %ignoreC = ('-t',1, '-ps',1, '-pt',1, '-pm',1,); |
27 |
|
# Starting options for rtrace (rpict values) |
28 |
|
my @rtraceA = split(' ', 'rtrace -u- -dt .05 -dc .5 -ds .25 -dr 1 ' . |
29 |
|
'-aa .2 -ar 64 -ad 512 -as 128 -lr 7 -lw 1e-03'); |
30 |
|
my @vwraysA = ('vwrays', '-ff', '-pj', '.67'); |
31 |
|
my @vwrightA = ('vwright', '-vtv'); |
32 |
< |
my @rpictA = ('rpict'); |
32 |
> |
my @rpictA = ('rpict', '-ps', '1'); |
33 |
|
my $outpatt = '^-o[vrxlLRXnNsmM]+'; |
34 |
|
my $refDepth = ""; |
35 |
|
my $irrad = 0; |
36 |
+ |
my $persist = 0; |
37 |
|
my $outlyr; |
38 |
|
my $outdir; |
39 |
|
my $outpic; |
77 |
|
} |
78 |
|
# Check rtrace options |
79 |
|
if (defined $rtraceC{$ARGV[0]}) { |
80 |
+ |
$persist ||= ("$ARGV[0]" =~ /^-PP?$/); |
81 |
|
push @rtraceA, $ARGV[0]; |
82 |
|
push @rpictA, shift(@ARGV); |
83 |
|
for (my $i = $rtraceC{$rpictA[-1]}; $i-- > 0; ) { |
127 |
|
} |
128 |
|
##################################################################### |
129 |
|
##### May as well run rpict? |
130 |
< |
if ($nprocs == 1 && !defined($outdir)) { |
130 |
> |
if ($nprocs == 1 && $persist == 0 && !defined($outdir)) { |
131 |
|
push(@rpictA, $ARGV[0]) if ($#ARGV == 0); |
132 |
|
exec @rpictA ; |
133 |
|
} |