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.16 by greg, Wed Apr 8 00:58:32 2020 UTC vs.
Revision 2.21 by greg, Sun Apr 10 16:00:14 2022 UTC

# Line 14 | Line 14 | my %rtraceC = ('-dt',1, '-dc',1, '-dj',1, '-ds',1, '-d
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 $ambounce = 0;
38 + my $ambcache = 1;
39 + my $ambfile;
40   my $outlyr;
41   my $outdir;
42   my $outpic;
# Line 75 | Line 80 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
80          }
81          # Check rtrace options
82          if (defined $rtraceC{$ARGV[0]}) {
83 +                if ("$ARGV[0]" =~ /^-PP?$/) {
84 +                        $persist = 1;
85 +                } elsif ("$ARGV[0]" eq '-ab') {
86 +                        $ambounce = $ARGV[1];
87 +                } elsif ("$ARGV[0]" eq '-aa') {
88 +                        $ambcache = ($ARGV[1] > 0.0);
89 +                } elsif ("$ARGV[0]" eq '-af') {
90 +                        $ambfile = "$ARGV[1]";
91 +                }
92                  push @rtraceA, $ARGV[0];
93                  push @rpictA, shift(@ARGV);
94                  for (my $i = $rtraceC{$rpictA[-1]}; $i-- > 0; ) {
# Line 124 | Line 138 | if (defined $outpic) {         # redirect output?
138   }
139   #####################################################################
140   ##### May as well run rpict?
141 < if ($nprocs == 1 && !defined($outdir)) {
141 > if ($nprocs == 1 && $persist == 0 && !defined($outdir)) {
142          push(@rpictA, $ARGV[0]) if ($#ARGV == 0);
143          exec @rpictA ;
144   }
# Line 135 | Line 149 | my $oct = $ARGV[0];
149   my $view = `@vwrightA 0`;
150   chomp $view;
151   my @res = split(/\s/, `@vwraysA -d`);
152 + #####################################################################
153 + ##### Run overture calculation?
154 + if ($nprocs > 1 && $ambounce > 0 && $ambcache && defined($ambfile)) {
155 +        my $oxres = int($res[1]/6);
156 +        my $oyres = int($res[3]/6);
157 +        print STDERR "Running $oxres by $oyres overture calculation " .
158 +                        "to populate '$ambfile'...\n";
159 +        system "@vwraysA -x $oxres -y $oyres -pj 0 -fa " .
160 +                "| sort -R | @rtraceA -faf -ov '$oct' > /dev/null";
161 +        die "Failure running overture\n" if ( $? );
162 +        print STDERR "Finished overture.\n";
163 + }
164   #####################################################################
165   ##### Generating picture with depth buffer?
166   if (defined $outzbf) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines