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.28 by greg, Fri Nov 17 23:30:07 2023 UTC vs.
Revision 2.32 by greg, Sat Sep 13 16:52:28 2025 UTC

# Line 7 | Line 7
7   #       G. Ward
8   #
9   use strict;
10 + my $windoz = ($^O eq "MSWin32" or $^O eq "MSWin64");
11   # we'll run rpict if no -n or -o* option
12   my $nprocs = 1;
13   # rtrace options and the associated number of arguments
# Line 18 | Line 19 | my %rtraceC = ('-dt',1, '-dc',1, '-dj',1, '-ds',1, '-d
19                  '-ap',2, '-am',1, '-ac',1, '-aC',1,
20                  '-cs',1, '-cw',2, '-pc',8, '-pXYZ',0);
21   # boolean rtrace options
22 < my @boolO = ('-w', '-bv', '-dv', '-i', '-u');
22 > my @boolO = ('-w', '-bv', '-dv', '-i', '-u', '-co');
23   # view options and the associated number of arguments
24   my %vwraysC = ('-vf',1, '-vtv',0, '-vtl',0, '-vth',0, '-vta',0, '-vts',0, '-vtc',0,
25                  '-x',1, '-y',1, '-vp',3, '-vd',3, '-vu',3, '-vh',1, '-vv',1,
# Line 35 | Line 36 | my @pvalueA = ('pvalue', '-r');
36   my $outpatt = '^-o[vrxlLRXnNsmM]+';
37   my $refDepth = "";
38   my $irrad = 0;
39 + my $specout = 0;
40 + my $ncsamp = 3;
41   my $persist = 0;
42   my $ambounce = 0;
43   my $ambcache = 1;
# Line 61 | Line 64 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
64                                  $irrad = ! $irrad;
65                          } elsif ("$ARGV[0]" =~ /^-i[-+01tfynTFYN]/) {
66                                  $irrad = ("$ARGV[0]" =~ /^-i[+1tyTY]/);
67 +                        } elsif ("$ARGV[0]" eq '-co') {
68 +                                $specout = ! $specout;
69 +                        } elsif ("$ARGV[0]" =~ /^-co[-+01tfynTFYN]/) {
70 +                                $specout = ("$ARGV[0]" =~ /^-co[+1tyTY]/);
71                          }
72 <                        push @rtraceA, $ARGV[0];
73 <                        push @rpictA, shift(@ARGV);
72 >                        push(@rpictA, $ARGV[0]) if ("$ARGV[0]" !~ /^-co/);
73 >                        push @rtraceA, shift(@ARGV);
74                          next OPTION;
75                  }
76          }
# Line 92 | Line 99 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
99                          $ambfile = "$ARGV[1]";
100                  } elsif ("$ARGV[0]" eq '-pXYZ') {
101                          push @pvalueA, $ARGV[0];
102 +                        $specout = 0;
103                  } elsif ("$ARGV[0]" eq '-pc') {
104                          push @pvalueA, '-p';
105                          push @pvalueA, @ARGV[1..8];
106 +                        $specout = 0;
107 +                } elsif ("$ARGV[0]" eq '-cs') {
108 +                        $ncsamp = $ARGV[1];
109                  }
110                  push @rtraceA, $ARGV[0];
111                  push @rpictA, shift(@ARGV);
# Line 135 | Line 146 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
146          }
147   }
148   die "Number of processes must be positive" if ($nprocs <= 0);
149 + if ($windoz && $nprocs > 1) {
150 +        print STDERR "Only one process supported under Windows\n";
151 +        $nprocs = 1;
152 + }
153 + if ($specout) {
154 +        $specout = ($ncsamp > 3);
155 + }
156   if (defined $outdir) {          # check conflicting options
157          die "Options -o and -o* are mutually exclusive\n" if (defined $outpic);
158          die "Options -z and -o* are mutually exclusive\n" if (defined $outzbf);
# Line 145 | Line 163 | if (defined $outpic) {         # redirect output?
163   }
164   #####################################################################
165   ##### May as well run rpict?
166 < if ($nprocs == 1 && $persist == 0 && !defined($outdir)) {
166 > if ($specout == 0 && $nprocs == 1 && $persist == 0 && !defined($outdir)) {
167          push(@rpictA, $ARGV[0]) if ($#ARGV == 0);
168          exec @rpictA ;
169   }
# Line 159 | Line 177 | my @res = split(/\s/, `@vwraysA -d`);
177   #####################################################################
178   ##### Resort pixels to reduce ambient cache collisions?
179   if ($nprocs > 1 && $ambounce > 0 && $ambcache && defined($ambfile)) {
180 <        if (!defined($outzbf) && !defined($outdir)) {
180 >        if ($specout == 0 && !defined($outzbf) && !defined($outdir)) {
181                  # Straight picture output, so just shuffle sample order
182                  system "cnt -s $res[1] $res[3] > /tmp/ord$$.txt";
183                  die "cnt error\n" if ( $? );
184                  system "@vwraysA -ff -i < /tmp/ord$$.txt " .
185                          "| @rtraceA -ffa -ov '$oct' > /tmp/pix$$.txt";
186                  die "Error running rtrace\n" if ( $? );
187 <                system "( getinfo < /tmp/pix$$.txt | getinfo -a 'VIEW=$view'; " .
187 >                system "( getinfo < /tmp/pix$$.txt | getinfo -r NCOMP " .
188 >                        "| getinfo -a 'VIEW=$view'; " .
189                          "getinfo - < /tmp/pix$$.txt | rlam /tmp/ord$$.txt - " .
190                          "| sort -k2rn -k1n ) | @pvalueA -Y $res[3] +X $res[1]";
191                  die "rlam error\n" if ( $? );
# Line 178 | Line 197 | if ($nprocs > 1 && $ambounce > 0 && $ambcache && defin
197          print STDERR "Running $ores[0] by $ores[1] overture calculation " .
198                          "to populate '$ambfile'...\n";
199          system "cnt -s @ores | @vwraysA -i -ff -x $ores[0] -y $ores[1] -pj 0 " .
200 <                "| @rtraceA -ff -ov '$oct' > /dev/null";
200 >                "| @rtraceA -ff -ov -pY '$oct' > /dev/null";
201          die "Failure running overture\n" if ( $? );
202          print STDERR "Finished overture.\n";
203   }
204   #####################################################################
205   ##### Generating picture with depth buffer?
206   if (defined $outzbf) {
207 <        exec "@vwraysA -ff | @rtraceA -fff -olv @res '$oct' | " .
208 <                "rsplit -ih -iH -f -of '$outzbf' -oh -oH -of3 - | " .
209 <                "@pvalueA -df | getinfo -a 'VIEW=$view'";
207 >        my $picvt = $specout ? 'rcomb -fc -' : "@pvalueA -df";
208 >        exec qq{@vwraysA -ff | @rtraceA -fff -olv @res "$oct" | } .
209 >                qq{rsplit -ih -iH -f -of "$outzbf" -oh -oH -of$ncsamp - | } .
210 >                $picvt . qq{ | getinfo -a "VIEW=$view"};
211   }
212   #####################################################################
213   ##### Base case with output picture only?
214   if (! defined $outdir) {
215 <        exec "@vwraysA -ff | @rtraceA -ffc @res '$oct' | getinfo -a 'VIEW=$view'";
215 >        exec qq{@vwraysA -ff | @rtraceA -ffc @res "$oct" | getinfo -a "VIEW=$view"};
216   }
217   #####################################################################
218   ##### Layered image output case
# Line 215 | Line 235 | my %rtoutC = (
235   # Arguments for rsplit based on output file type
236   my %rcodeC = (
237          '.hdr', ['-of3', "!@pvalueA -df -u"],
238 +        '.hsr', ["-of$ncsamp", '!rcomb -fc -'],
239          '.dpt', ['-of', "!rcode_depth$refDepth -ff"],
240          '.nrm', ['-of3', '!rcode_norm -ff'],
241          '.idx', ['-oa', '!rcode_ident "-t       "']
242   );
243 + if ($specout) {         # adjust actions for -co+ option
244 +        $rtoutC{'v'} = 'radiance.hsr';
245 +        $rtoutC{'r'} = 'r_refl.hsr';
246 +        $rtoutC{'x'} = 'r_unrefl.hsr';
247 + }
248   if ($irrad) {           # adjust actions for -i+ option
249 <        $rtoutC{'v'} = 'irradiance.hdr';
249 >        $rtoutC{'v'} = $specout ? 'irradiance.hsr' : 'irradiance.hdr';
250          delete $rtoutC{'r'};
251          delete $rtoutC{'x'};
252          delete $rtoutC{'R'};
# Line 241 | Line 267 | foreach my $oval (split //, $outlyr) {
267          delete $rtoutC{$oval};
268   }
269                          # call rtrace + rsplit
270 < exec "@vwraysA -ff | @rtraceA -fff @res '$oct' | getinfo -a 'VIEW=$view' | @rsplitA";
270 > exec qq{@vwraysA -ff | @rtraceA -fff @res "$oct" | getinfo -a "VIEW=$view" | @rsplitA};

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines