ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/util/rtpict.pl
(Generate patch)

Comparing ray/src/util/rtpict.pl (file contents):
Revision 2.26 by greg, Tue Jan 24 21:54:49 2023 UTC vs.
Revision 2.28 by greg, Fri Nov 17 23:30:07 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, '-pXYZ',0);
20   # boolean rtrace options
21   my @boolO = ('-w', '-bv', '-dv', '-i', '-u');
22   # view options and the associated number of arguments
# Line 30 | Line 31 | my @rtraceA = split(' ', 'rtrace -u- -dt .05 -dc .5 -d
31   my @vwraysA = ('vwrays', '-pj', '.67');
32   my @vwrightA = ('vwright', '-vtv');
33   my @rpictA = ('rpict', '-ps', '1');
34 + my @pvalueA = ('pvalue', '-r');
35   my $outpatt = '^-o[vrxlLRXnNsmM]+';
36   my $refDepth = "";
37   my $irrad = 0;
# Line 88 | Line 90 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
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);
# Line 161 | Line 168 | if ($nprocs > 1 && $ambounce > 0 && $ambcache && defin
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 ) | pvalue -r -Y $res[3] +X $res[1]";
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;
# Line 180 | Line 187 | if ($nprocs > 1 && $ambounce > 0 && $ambcache && defin
187   if (defined $outzbf) {
188          exec "@vwraysA -ff | @rtraceA -fff -olv @res '$oct' | " .
189                  "rsplit -ih -iH -f -of '$outzbf' -oh -oH -of3 - | " .
190 <                "pvalue -r -df | getinfo -a 'VIEW=$view'";
190 >                "@pvalueA -df | getinfo -a 'VIEW=$view'";
191   }
192   #####################################################################
193   ##### Base case with output picture only?
# Line 207 | 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       "']

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines