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.23 by greg, Mon Apr 11 14:59:54 2022 UTC vs.
Revision 2.26 by greg, Tue Jan 24 21:54:49 2023 UTC

# Line 26 | Line 26 | my %vwraysC = ('-vf',1, '-vtv',0, '-vtl',0, '-vth',0,
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');
29 >                                '-aa .2 -ar 64 -ad 512 -as 128 -lr 7 -lw 1e-04');
30   my @vwraysA = ('vwrays', '-pj', '.67');
31   my @vwrightA = ('vwright', '-vtv');
32   my @rpictA = ('rpict', '-ps', '1');
# Line 153 | Line 153 | my @res = split(/\s/, `@vwraysA -d`);
153   ##### Resort pixels to reduce ambient cache collisions?
154   if ($nprocs > 1 && $ambounce > 0 && $ambcache && defined($ambfile)) {
155          if (!defined($outzbf) && !defined($outdir)) {
156 <                # Straight picture output, so just randomize sample order
157 <                system "cnt $res[1] $res[3] | sort -R > /tmp/ord$$.txt";
158 <                die "sort error\n" if ( $? );
156 >                # Straight picture output, so just shuffle sample order
157 >                system "cnt -s $res[1] $res[3] > /tmp/ord$$.txt";
158 >                die "cnt error\n" if ( $? );
159                  system "@vwraysA -ff -i < /tmp/ord$$.txt " .
160                          "| @rtraceA -ffa -ov '$oct' > /tmp/pix$$.txt";
161                  die "Error running rtrace\n" if ( $? );
# Line 167 | Line 167 | if ($nprocs > 1 && $ambounce > 0 && $ambcache && defin
167                  exit 0;
168          }
169          # Else randomize overture calculation to prime ambient cache
170 <        my $oxres = int($res[1]/6);
171 <        my $oyres = int($res[3]/6);
172 <        print STDERR "Running $oxres by $oyres overture calculation " .
170 >        my @ores = (int($res[1]/6), int($res[3]/6));
171 >        print STDERR "Running $ores[0] by $ores[1] overture calculation " .
172                          "to populate '$ambfile'...\n";
173 <        system "@vwraysA -x $oxres -y $oyres -pj 0 " .
174 <                "| sort -R | @rtraceA -faf -ov '$oct' > /dev/null";
173 >        system "cnt -s @ores | @vwraysA -i -ff -x $ores[0] -y $ores[1] -pj 0 " .
174 >                "| @rtraceA -ff -ov '$oct' > /dev/null";
175          die "Failure running overture\n" if ( $? );
176          print STDERR "Finished overture.\n";
177   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines