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.27 by greg, Wed Nov 15 18:02:53 2023 UTC

# Line 15 | Line 15 | my %rtraceC = ('-dt',1, '-dc',1, '-dj',1, '-ds',1, '-d
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,
18 <                '-ap',2, '-am',1, '-ac',1, '-aC',1);
18 >                '-ap',2, '-am',1, '-ac',1, '-aC',1,
19 >                '-cs',1, '-cw',2, '-pc',8, '-pRGB',0, '-pXYZ',0);
20   # boolean rtrace options
21   my @boolO = ('-w', '-bv', '-dv', '-i', '-u');
22   # view options and the associated number of arguments
# Line 26 | Line 27 | my %vwraysC = ('-vf',1, '-vtv',0, '-vtl',0, '-vth',0,
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');
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', '-ps', '1');
# Line 153 | Line 154 | my @res = split(/\s/, `@vwraysA -d`);
154   ##### Resort pixels to reduce ambient cache collisions?
155   if ($nprocs > 1 && $ambounce > 0 && $ambcache && defined($ambfile)) {
156          if (!defined($outzbf) && !defined($outdir)) {
157 <                # Straight picture output, so just randomize sample order
158 <                system "cnt $res[1] $res[3] | sort -R > /tmp/ord$$.txt";
159 <                die "sort error\n" if ( $? );
157 >                # Straight picture output, so just shuffle sample order
158 >                system "cnt -s $res[1] $res[3] > /tmp/ord$$.txt";
159 >                die "cnt error\n" if ( $? );
160                  system "@vwraysA -ff -i < /tmp/ord$$.txt " .
161                          "| @rtraceA -ffa -ov '$oct' > /tmp/pix$$.txt";
162                  die "Error running rtrace\n" if ( $? );
# Line 167 | Line 168 | if ($nprocs > 1 && $ambounce > 0 && $ambcache && defin
168                  exit 0;
169          }
170          # Else randomize overture calculation to prime ambient cache
171 <        my $oxres = int($res[1]/6);
172 <        my $oyres = int($res[3]/6);
172 <        print STDERR "Running $oxres by $oyres overture calculation " .
171 >        my @ores = (int($res[1]/6), int($res[3]/6));
172 >        print STDERR "Running $ores[0] by $ores[1] overture calculation " .
173                          "to populate '$ambfile'...\n";
174 <        system "@vwraysA -x $oxres -y $oyres -pj 0 " .
175 <                "| sort -R | @rtraceA -faf -ov '$oct' > /dev/null";
174 >        system "cnt -s @ores | @vwraysA -i -ff -x $ores[0] -y $ores[1] -pj 0 " .
175 >                "| @rtraceA -ff -ov '$oct' > /dev/null";
176          die "Failure running overture\n" if ( $? );
177          print STDERR "Finished overture.\n";
178   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines