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.29 by greg, Mon Dec 11 19:21:43 2023 UTC vs.
Revision 2.31 by greg, Thu Jan 23 01:59:17 2025 UTC

# Line 179 | Line 179 | if ($nprocs > 1 && $ambounce > 0 && $ambcache && defin
179                  system "@vwraysA -ff -i < /tmp/ord$$.txt " .
180                          "| @rtraceA -ffa -ov '$oct' > /tmp/pix$$.txt";
181                  die "Error running rtrace\n" if ( $? );
182 <                system "( getinfo < /tmp/pix$$.txt | getinfo -a 'VIEW=$view'; " .
182 >                system "( getinfo < /tmp/pix$$.txt | getinfo -r NCOMP " .
183 >                        "| getinfo -a 'VIEW=$view'; " .
184                          "getinfo - < /tmp/pix$$.txt | rlam /tmp/ord$$.txt - " .
185                          "| sort -k2rn -k1n ) | @pvalueA -Y $res[3] +X $res[1]";
186                  die "rlam error\n" if ( $? );
# Line 198 | Line 199 | if ($nprocs > 1 && $ambounce > 0 && $ambcache && defin
199   #####################################################################
200   ##### Generating picture with depth buffer?
201   if (defined $outzbf) {
202 <        my $picvt = $specout ? 'rmtxcomb -fc -' : "@pvalueA -df";
202 >        my $picvt = $specout ? 'rcomb -fc -' : "@pvalueA -df";
203          exec "@vwraysA -ff | @rtraceA -fff -olv @res '$oct' | " .
204                  "rsplit -ih -iH -f -of '$outzbf' -oh -oH -of$ncsamp - | " .
205                  $picvt . " | getinfo -a 'VIEW=$view'";
# Line 229 | Line 230 | my %rtoutC = (
230   # Arguments for rsplit based on output file type
231   my %rcodeC = (
232          '.hdr', ['-of3', "!@pvalueA -df -u"],
233 <        '.hsr', ["-of$ncsamp", '!rmtxcomb -fc -'],
233 >        '.hsr', ["-of$ncsamp", '!rcomb -fc -'],
234          '.dpt', ['-of', "!rcode_depth$refDepth -ff"],
235          '.nrm', ['-of3', '!rcode_norm -ff'],
236          '.idx', ['-oa', '!rcode_ident "-t       "']

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)