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.10 by greg, Wed Aug 14 22:18:03 2019 UTC vs.
Revision 2.28 by greg, Fri Nov 17 23:30:07 2023 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);
17 >                '-me',3, '-ma',3, '-mg',1, '-ms',1, '-lr',1, '-lw',1,
18 >                '-ap',2, '-am',1, '-ac',1, '-aC',1,
19 >                '-cs',1, '-cw',2, '-pc',8, '-pXYZ',0);
20   # boolean rtrace options
21   my @boolO = ('-w', '-bv', '-dv', '-i', '-u');
22   # view options and the associated number of arguments
# Line 22 | Line 24 | my %vwraysC = ('-vf',1, '-vtv',0, '-vtl',0, '-vth',0,
24                  '-x',1, '-y',1, '-vp',3, '-vd',3, '-vu',3, '-vh',1, '-vv',1,
25                  '-vo',1, '-va',1, '-vs',1, '-vl',1, '-pa',1, '-pj',1, '-pd',1);
26   # options we need to silently ignore
27 < my %ignoreC = ('-t',1, '-ps',1, '-pt',1, '-pm',1);
27 > my %ignoreC = ('-t',1, '-ps',1, '-pt',1, '-pm',1,);
28   # Starting options for rtrace (rpict values)
29   my @rtraceA = split(' ', 'rtrace -u- -dt .05 -dc .5 -ds .25 -dr 1 ' .
30 <                                '-aa .2 -ar 64 -ad 512 -as 128 -lr 7 -lw 1e-03');
31 < my @vwraysA = ('vwrays', '-ff', '-pj', '.67');
30 >                                '-aa .2 -ar 64 -ad 512 -as 128 -lr 7 -lw 1e-04');
31 > my @vwraysA = ('vwrays', '-pj', '.67');
32   my @vwrightA = ('vwright', '-vtv');
33 < my @rpictA = ('rpict');
33 > my @rpictA = ('rpict', '-ps', '1');
34 > my @pvalueA = ('pvalue', '-r');
35   my $outpatt = '^-o[vrxlLRXnNsmM]+';
36   my $refDepth = "";
37   my $irrad = 0;
38 + my $persist = 0;
39 + my $ambounce = 0;
40 + my $ambcache = 1;
41 + my $ambfile;
42   my $outlyr;
43   my $outdir;
44   my $outpic;
# Line 40 | Line 47 | OPTION:                                # sort through options
47   while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
48          # Check for file inclusion
49          if ("$ARGV[0]" =~ /^\@/) {
50 <                open my $handle, '<', substr($ARGV[0], 1);
50 >                open my $handle, '<', substr($ARGV[0], 1) or die "No file for $ARGV[0]\n";
51                  shift @ARGV;
52                  chomp(my @args = <$handle>);
53                  close $handle;
# Line 75 | Line 82 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
82          }
83          # Check rtrace options
84          if (defined $rtraceC{$ARGV[0]}) {
85 +                if ("$ARGV[0]" =~ /^-PP?$/) {
86 +                        $persist = 1;
87 +                } elsif ("$ARGV[0]" eq '-ab') {
88 +                        $ambounce = $ARGV[1];
89 +                } elsif ("$ARGV[0]" eq '-aa') {
90 +                        $ambcache = ($ARGV[1] > 0.0);
91 +                } elsif ("$ARGV[0]" eq '-af') {
92 +                        $ambfile = "$ARGV[1]";
93 +                } elsif ("$ARGV[0]" eq '-pXYZ') {
94 +                        push @pvalueA, $ARGV[0];
95 +                } elsif ("$ARGV[0]" eq '-pc') {
96 +                        push @pvalueA, '-p';
97 +                        push @pvalueA, @ARGV[1..8];
98 +                }
99                  push @rtraceA, $ARGV[0];
100                  push @rpictA, shift(@ARGV);
101                  for (my $i = $rtraceC{$rpictA[-1]}; $i-- > 0; ) {
# Line 124 | Line 145 | if (defined $outpic) {         # redirect output?
145   }
146   #####################################################################
147   ##### May as well run rpict?
148 < if ($nprocs == 1 && !defined($outdir)) {
148 > if ($nprocs == 1 && $persist == 0 && !defined($outdir)) {
149          push(@rpictA, $ARGV[0]) if ($#ARGV == 0);
150          exec @rpictA ;
151   }
# Line 136 | Line 157 | my $view = `@vwrightA 0`;
157   chomp $view;
158   my @res = split(/\s/, `@vwraysA -d`);
159   #####################################################################
160 + ##### Resort pixels to reduce ambient cache collisions?
161 + if ($nprocs > 1 && $ambounce > 0 && $ambcache && defined($ambfile)) {
162 +        if (!defined($outzbf) && !defined($outdir)) {
163 +                # Straight picture output, so just shuffle sample order
164 +                system "cnt -s $res[1] $res[3] > /tmp/ord$$.txt";
165 +                die "cnt error\n" if ( $? );
166 +                system "@vwraysA -ff -i < /tmp/ord$$.txt " .
167 +                        "| @rtraceA -ffa -ov '$oct' > /tmp/pix$$.txt";
168 +                die "Error running rtrace\n" if ( $? );
169 +                system "( getinfo < /tmp/pix$$.txt | getinfo -a 'VIEW=$view'; " .
170 +                        "getinfo - < /tmp/pix$$.txt | rlam /tmp/ord$$.txt - " .
171 +                        "| sort -k2rn -k1n ) | @pvalueA -Y $res[3] +X $res[1]";
172 +                die "rlam error\n" if ( $? );
173 +                unlink ("/tmp/ord$$.txt", "/tmp/pix$$.txt");
174 +                exit 0;
175 +        }
176 +        # Else randomize overture calculation to prime ambient cache
177 +        my @ores = (int($res[1]/6), int($res[3]/6));
178 +        print STDERR "Running $ores[0] by $ores[1] overture calculation " .
179 +                        "to populate '$ambfile'...\n";
180 +        system "cnt -s @ores | @vwraysA -i -ff -x $ores[0] -y $ores[1] -pj 0 " .
181 +                "| @rtraceA -ff -ov '$oct' > /dev/null";
182 +        die "Failure running overture\n" if ( $? );
183 +        print STDERR "Finished overture.\n";
184 + }
185 + #####################################################################
186   ##### Generating picture with depth buffer?
187   if (defined $outzbf) {
188 <        exec "@vwraysA | @rtraceA -fff -olv @res $oct | " .
189 <                "rsplit -ih -iH -f " .
190 <                        "-of $outzbf " .
144 <                        "-oh -oH -of3 '!pvalue -r -df' | " .
145 <                "getinfo -a 'VIEW=$view'";
188 >        exec "@vwraysA -ff | @rtraceA -fff -olv @res '$oct' | " .
189 >                "rsplit -ih -iH -f -of '$outzbf' -oh -oH -of3 - | " .
190 >                "@pvalueA -df | getinfo -a 'VIEW=$view'";
191   }
192   #####################################################################
193   ##### Base case with output picture only?
194   if (! defined $outdir) {
195 <        exec "@vwraysA | @rtraceA -ffc @res $oct | getinfo -a 'VIEW=$view'";
195 >        exec "@vwraysA -ff | @rtraceA -ffc @res '$oct' | getinfo -a 'VIEW=$view'";
196   }
197   #####################################################################
198   ##### Layered image output case
# Line 169 | Line 214 | my %rtoutC = (
214   );
215   # Arguments for rsplit based on output file type
216   my %rcodeC = (
217 <        '.hdr', ['-of3', '!pvalue -r -df -u'],
217 >        '.hdr', ['-of3', "!@pvalueA -df -u"],
218          '.dpt', ['-of', "!rcode_depth$refDepth -ff"],
219          '.nrm', ['-of3', '!rcode_norm -ff'],
220          '.idx', ['-oa', '!rcode_ident "-t       "']
# Line 188 | Line 233 | if (! -d $outdir) {
233   foreach my $oval (split //, $outlyr) {
234          die "Duplicate or unsupported type '$oval' in -o$outlyr\n"
235                                          if (!defined $rtoutC{$oval});
236 +        my $outfile = "$outdir/$rtoutC{$oval}";
237 +        die "File '$outfile' already exists\n" if (-e $outfile);
238          my ($otyp) = ($rtoutC{$oval} =~ /(\.[^.]+)$/);
239          push @rsplitA, $rcodeC{$otyp}[0];
240 <        push @rsplitA, qq{'$rcodeC{$otyp}[1] > "$outdir/$rtoutC{$oval}"'};
240 >        push @rsplitA, qq{'$rcodeC{$otyp}[1] > "$outfile"'};
241          delete $rtoutC{$oval};
242   }
243                          # call rtrace + rsplit
244 < exec "@vwraysA | @rtraceA -fff @res $oct | getinfo -a 'VIEW=$view' | @rsplitA";
244 > exec "@vwraysA -ff | @rtraceA -fff @res '$oct' | getinfo -a 'VIEW=$view' | @rsplitA";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines