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.8 by greg, Tue Jul 23 01:03:30 2019 UTC vs.
Revision 2.28 by greg, Fri Nov 17 23:30:07 2023 UTC

# Line 10 | Line 10 | use strict;
10   # we'll run rpict if no -n or -o* option
11   my $nprocs = 1;
12   # rtrace options and the associated number of arguments
13 < my %rtraceC = ("-dt",1, "-dc",1, "-dj",1, "-ds",1, "-dr",1, "-dp",1,
14 <                "-ss",1, "-st",1, "-e",1, "-am",1,
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);
13 > my %rtraceC = ('-dt',1, '-dc',1, '-dj',1, '-ds',1, '-dr',1, '-dp',1,
14 >                '-ss',1, '-st',1, '-e',1, '-am',1, '-P',1, '-PP',1,
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,
19 >                '-cs',1, '-cw',2, '-pc',8, '-pXYZ',0);
20   # boolean rtrace options
21 < my @boolO = ("-w", "-bv", "-dv", "-i", "-u");
20 < my $irrad = 0;
21 > my @boolO = ('-w', '-bv', '-dv', '-i', '-u');
22   # view options and the associated number of arguments
23 < my %vwraysC = ("-vf",1, "-vtv",0, "-vtl",0, "-vth",0, "-vta",0, "-vts",0, "-vtc",0,
24 <                "-x",1, "-y",1, "-vp",3, "-vd",3, "-vu",3, "-vh",1, "-vv",1,
25 <                "-vo",1, "-va",1, "-vs",1, "-vl",1, "-pa",1, "-pj",1, "-pd",1);
23 > my %vwraysC = ('-vf',1, '-vtv',0, '-vtl',0, '-vth',0, '-vta',0, '-vts',0, '-vtc',0,
24 >                '-x',1, '-y',1, '-vp',3, '-vd',3, '-vu',3, '-vh',1, '-vv',1,
25 >                '-vo',1, '-va',1, '-vs',1, '-vl',1, '-pa',1, '-pj',1, '-pd',1);
26   # options we need to silently ignore
27 < my %ignoreC = ("-t",1, "-ps",1, "-pt",1, "-pm",1);
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");
31 < my @vwraysA = ("vwrays", "-ff", "-pj", ".67");
32 < my @vwrightA = ("vwright", "-vtv");
33 < my @rpictA = ("rpict");
34 < my @rsplitA = ("rsplit", "'-t   '", "-ih", "-iH", "-oh", "-oH");
35 < my $refDepth="";
36 < # Supported rtrace -o* options and data type encoders
37 < my %rtoutC = (
38 <        v =>    "radiance.hdr",
39 <        r =>    "mirrored.hdr",
40 <        x =>    "unmirrored.hdr",
41 <        i =>    "irradiance.hdr",
41 <        l =>    "effective.dpt",
42 <        L =>    "firstsurface.dpt",
43 <        R =>    "mirrored.dpt",
44 <        X =>    "unmirrored.dpt",
45 <        n =>    "perturbed.nrm",
46 <        N =>    "unperturbed.nrm",
47 <        s =>    "surface.idx",
48 <        m =>    "modifier.idx",
49 <        M =>    "material.idx"
50 < );
51 < my $outpatt = "^-o[vrxlLRXnNsmM]+";
52 < # Supported compressed format suffixes and compressors, decompressors
53 < my %comprC = (
54 <        ".tgz", ["tar czf ", "tar xzf "],
55 <        ".zip", ["zip -q -r ", "unzip -q "]
56 < );
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-04');
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;
38 > my $persist = 0;
39 > my $ambounce = 0;
40 > my $ambcache = 1;
41 > my $ambfile;
42   my $outlyr;
43   my $outdir;
44   my $outpic;
# Line 62 | Line 47 | OPTION:                                # sort through options
47   while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
48          # Check for file inclusion
49          if ("$ARGV[0]" =~ /^\@/) {
50 <                open my $handle, '<', substr($ARGV[0], 1);
50 >                open my $handle, '<', substr($ARGV[0], 1) or die "No file for $ARGV[0]\n";
51                  shift @ARGV;
52                  chomp(my @args = <$handle>);
53                  close $handle;
# Line 72 | Line 57 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
57          # Check booleans
58          for my $boopt (@boolO) {
59                  if ("$ARGV[0]" =~ ('^' . $boopt . '[-+01tfynTFYN]?$')) {
60 <                        push @rtraceA, $ARGV[0];
76 <                        push @rpictA, shift(@ARGV);
77 <                        if ("$ARGV[0]" eq "-i") {
60 >                        if ("$ARGV[0]" eq '-i') {
61                                  $irrad = ! $irrad;
62                          } elsif ("$ARGV[0]" =~ /^-i[-+01tfynTFYN]/) {
63                                  $irrad = ("$ARGV[0]" =~ /^-i[+1tyTY]/);
64                          }
65 +                        push @rtraceA, $ARGV[0];
66 +                        push @rpictA, shift(@ARGV);
67                          next OPTION;
68                  }
69          }
# Line 97 | Line 82 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
82          }
83          # Check rtrace options
84          if (defined $rtraceC{$ARGV[0]}) {
85 +                if ("$ARGV[0]" =~ /^-PP?$/) {
86 +                        $persist = 1;
87 +                } elsif ("$ARGV[0]" eq '-ab') {
88 +                        $ambounce = $ARGV[1];
89 +                } elsif ("$ARGV[0]" eq '-aa') {
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);
101                  for (my $i = $rtraceC{$rpictA[-1]}; $i-- > 0; ) {
# Line 114 | Line 113 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
113                  next OPTION;
114          }
115          # Check for output file or number of processes
116 <        if ("$ARGV[0]" eq "-o") {
116 >        if ("$ARGV[0]" eq '-o') {
117                  shift @ARGV;
118                  $outpic = shift(@ARGV);
119 <        } elsif ("$ARGV[0]" eq "-z") {
119 >        } elsif ("$ARGV[0]" eq '-z') {
120                  push @rpictA, shift(@ARGV);
121                  $outzbf = $ARGV[0];
122                  push @rpictA, shift(@ARGV);
123 <        } elsif ("$ARGV[0]" eq "-n") {
123 >        } elsif ("$ARGV[0]" eq '-n') {
124                  shift @ARGV;
125                  $nprocs = shift(@ARGV);
126 <        } elsif ("$ARGV[0]" eq "-d") {
126 >        } elsif ("$ARGV[0]" eq '-d') {
127                  shift @ARGV;
128 <                $refDepth = " -d " . shift(@ARGV);
128 >                $refDepth = ' -d ' . shift(@ARGV);
129          } elsif ("$ARGV[0]" =~ "$outpatt") {
130                  push @rtraceA, $ARGV[0];
131                  $outlyr = substr(shift(@ARGV), 2);
# Line 135 | Line 134 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
134                  die "Unsupported option: " . $ARGV[0] . "\n";
135          }
136   }
138 my %rcodeC = (
139        ".hdr", ["-of3", "!pvalue -r -df -u"],
140        ".dpt", ["-of", "!rcode_depth$refDepth -ff"],
141        ".nrm", ["-of3", "!rcode_norm -ff"],
142        ".idx", ["-oa", '!rcode_ident "-t       "']
143 );
137   die "Number of processes must be positive" if ($nprocs <= 0);
138   if (defined $outdir) {          # check conflicting options
139          die "Options -o and -o* are mutually exclusive\n" if (defined $outpic);
# Line 150 | Line 143 | if (defined $outpic) {         # redirect output?
143          die "File '$outpic' already exists\n" if (-e $outpic);
144          open STDOUT, '>', "$outpic";
145   }
146 <                                # may as well run rpict?
147 < if ($nprocs == 1 && !defined($outdir)) {
146 > #####################################################################
147 > ##### May as well run rpict?
148 > if ($nprocs == 1 && $persist == 0 && !defined($outdir)) {
149          push(@rpictA, $ARGV[0]) if ($#ARGV == 0);
150          exec @rpictA ;
151   }
152 < push @rtraceA, ("-n", "$nprocs");
152 > # OK, we're running rtrace in some capacity...
153 > push @rtraceA, ('-n', "$nprocs");
154   die "Need single octree argument\n" if ($#ARGV != 0);
155   my $oct = $ARGV[0];
156   my $view = `@vwrightA 0`;
157 + chomp $view;
158   my @res = split(/\s/, `@vwraysA -d`);
159 < if (defined $outdir) {          # layered output directory?
160 <        my $pkg;
161 <        my ($pkgext) = ($outdir =~ /(\.[^.]+)$/);
162 <        
163 <        if ($pkgext) {
164 <                die "Unknown compressor for '$pkgext'\n" if (!defined $comprC{$pkgext});
165 <                $pkg = $outdir;
166 <                die "Output '$pkg' exists as directory!\n" if (-d $pkg);
167 <                $outdir = substr($pkg, 0, length($pkg)-length($pkgext));
168 <                if (-e $outdir) {
169 <                        die "Both '$outdir' and '$pkg' exist!\n" if (-e $pkg);
170 <                } elsif (-e $pkg) {
171 <                        system "$comprC{$pkgext}[1] '$pkg'";
172 <                        die "Cannot decompress '$pkg'\n" if ( $? );
173 <                }
159 > #####################################################################
160 > ##### Resort pixels to reduce ambient cache collisions?
161 > if ($nprocs > 1 && $ambounce > 0 && $ambcache && defined($ambfile)) {
162 >        if (!defined($outzbf) && !defined($outdir)) {
163 >                # Straight picture output, so just shuffle sample order
164 >                system "cnt -s $res[1] $res[3] > /tmp/ord$$.txt";
165 >                die "cnt error\n" if ( $? );
166 >                system "@vwraysA -ff -i < /tmp/ord$$.txt " .
167 >                        "| @rtraceA -ffa -ov '$oct' > /tmp/pix$$.txt";
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 ) | @pvalueA -Y $res[3] +X $res[1]";
172 >                die "rlam error\n" if ( $? );
173 >                unlink ("/tmp/ord$$.txt", "/tmp/pix$$.txt");
174 >                exit 0;
175          }
176 <        if (! -d $outdir) {
177 <                mkdir $outdir or die("Cannot create output directory '$outdir'\n");
178 <        }
179 <                                # construct rsplit command
180 <        foreach (0..(length($outlyr) - 1)) {
181 <                my $oval=substr($outlyr, $_, 1);
182 <                $oval = "i" if ($oval eq "v" && $irrad);
183 <                die "Duplicate letter in -o$outlyr\n" if (!defined $rtoutC{$oval});
187 <                my ($otyp) = ($rtoutC{$oval} =~ /(\.[^.]+)$/);
188 <                push @rsplitA, $rcodeC{$otyp}[0];
189 <                push @rsplitA, qq{'$rcodeC{$otyp}[1] > "$outdir/$rtoutC{$oval}"'};
190 <                delete $rtoutC{$oval};
191 <        }
192 <        system "@vwraysA | @rtraceA -fff @res $oct | " .
193 <                        "getinfo -a 'VIEW=$view' | @rsplitA";
194 <        die "Error running rtrace\n" if ( $? );
195 <        if (defined $pkg) {     # compress folder if requested
196 <                unlink $pkg;
197 <                system "$comprC{$pkgext}[0] '$pkg' '$outdir'";
198 <                die "Cannot compress folder '$outdir'\n" if ( $? );
199 <                system "rm -r '$outdir'";
200 <        }
201 <        exit;                   # all done with layered output
176 >        # Else randomize overture calculation to prime ambient cache
177 >        my @ores = (int($res[1]/6), int($res[3]/6));
178 >        print STDERR "Running $ores[0] by $ores[1] overture calculation " .
179 >                        "to populate '$ambfile'...\n";
180 >        system "cnt -s @ores | @vwraysA -i -ff -x $ores[0] -y $ores[1] -pj 0 " .
181 >                "| @rtraceA -ff -ov '$oct' > /dev/null";
182 >        die "Failure running overture\n" if ( $? );
183 >        print STDERR "Finished overture.\n";
184   }
185 < if (defined $outzbf) {          # generating depth buffer?
186 <        exec "@vwraysA | @rtraceA -fff -olv @res $oct | " .
187 <                "rsplit -ih -iH -f " .
188 <                        "-of $outzbf " .
189 <                        "-oh -oH -of3 '!pvalue -r -df' | " .
190 <                "getinfo -a 'VIEW=$view'";
185 > #####################################################################
186 > ##### Generating picture with depth buffer?
187 > if (defined $outzbf) {
188 >        exec "@vwraysA -ff | @rtraceA -fff -olv @res '$oct' | " .
189 >                "rsplit -ih -iH -f -of '$outzbf' -oh -oH -of3 - | " .
190 >                "@pvalueA -df | getinfo -a 'VIEW=$view'";
191   }
192 <                                # no depth buffer, simplest case
193 < exec "@vwraysA | @rtraceA -ffc @res $oct | getinfo -a 'VIEW=$view'";
192 > #####################################################################
193 > ##### Base case with output picture only?
194 > if (! defined $outdir) {
195 >        exec "@vwraysA -ff | @rtraceA -ffc @res '$oct' | getinfo -a 'VIEW=$view'";
196 > }
197 > #####################################################################
198 > ##### Layered image output case
199 > my @rsplitA = ("rsplit", "'-t   '", "-ih", "-iH", "-oh", "-oH");
200 > # Supported rtrace -o* options and output file name.typ
201 > my %rtoutC = (
202 >        v =>    'radiance.hdr',
203 >        r =>    'r_refl.hdr',
204 >        x =>    'r_unrefl.hdr',
205 >        l =>    'd_effective.dpt',
206 >        L =>    'd_firstsurf.dpt',
207 >        R =>    'd_refl.dpt',
208 >        X =>    'd_unrefl.dpt',
209 >        n =>    'perturbed.nrm',
210 >        N =>    'unperturbed.nrm',
211 >        s =>    'surface.idx',
212 >        m =>    'modifier.idx',
213 >        M =>    'material.idx'
214 > );
215 > # Arguments for rsplit based on output file type
216 > my %rcodeC = (
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       "']
221 > );
222 > if ($irrad) {           # adjust actions for -i+ option
223 >        $rtoutC{'v'} = 'irradiance.hdr';
224 >        delete $rtoutC{'r'};
225 >        delete $rtoutC{'x'};
226 >        delete $rtoutC{'R'};
227 >        delete $rtoutC{'X'};
228 > }
229 > if (! -d $outdir) {
230 >        mkdir $outdir or die("Cannot create output directory '$outdir'\n");
231 > }
232 >                        # construct rsplit command
233 > foreach my $oval (split //, $outlyr) {
234 >        die "Duplicate or unsupported type '$oval' in -o$outlyr\n"
235 >                                        if (!defined $rtoutC{$oval});
236 >        my $outfile = "$outdir/$rtoutC{$oval}";
237 >        die "File '$outfile' already exists\n" if (-e $outfile);
238 >        my ($otyp) = ($rtoutC{$oval} =~ /(\.[^.]+)$/);
239 >        push @rsplitA, $rcodeC{$otyp}[0];
240 >        push @rsplitA, qq{'$rcodeC{$otyp}[1] > "$outfile"'};
241 >        delete $rtoutC{$oval};
242 > }
243 >                        # call rtrace + rsplit
244 > exec "@vwraysA -ff | @rtraceA -fff @res '$oct' | getinfo -a 'VIEW=$view' | @rsplitA";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines