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.18 by greg, Wed Apr 8 16:20:00 2020 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   # boolean rtrace options
20 < my @boolO = ("-w", "-bv", "-dv", "-i", "-u");
20 < my $irrad = 0;
20 > my @boolO = ('-w', '-bv', '-dv', '-i', '-u');
21   # view options and the associated number of arguments
22 < my %vwraysC = ("-vf",1, "-vtv",0, "-vtl",0, "-vth",0, "-vta",0, "-vts",0, "-vtc",0,
23 <                "-x",1, "-y",1, "-vp",3, "-vd",3, "-vu",3, "-vh",1, "-vv",1,
24 <                "-vo",1, "-va",1, "-vs",1, "-vl",1, "-pa",1, "-pj",1, "-pd",1);
22 > my %vwraysC = ('-vf',1, '-vtv',0, '-vtl',0, '-vth',0, '-vta',0, '-vts',0, '-vtc',0,
23 >                '-x',1, '-y',1, '-vp',3, '-vd',3, '-vu',3, '-vh',1, '-vv',1,
24 >                '-vo',1, '-va',1, '-vs',1, '-vl',1, '-pa',1, '-pj',1);
25   # options we need to silently ignore
26 < my %ignoreC = ("-t",1, "-ps",1, "-pt",1, "-pm",1);
26 > my %ignoreC = ('-t',1, '-ps',1, '-pt',1, '-pm',1, '-pd',1);
27   # Starting options for rtrace (rpict values)
28 < my @rtraceA = split(' ', "rtrace -u- -dt .05 -dc .5 -ds .25 -dr 1 " .
29 <                                "-aa .2 -ar 64 -ad 512 -as 128 -lr 7 -lw 1e-03");
30 < my @vwraysA = ("vwrays", "-ff", "-pj", ".67");
31 < my @vwrightA = ("vwright", "-vtv");
32 < my @rpictA = ("rpict");
33 < my @rsplitA = ("rsplit", "'-t   '", "-ih", "-iH", "-oh", "-oH");
34 < my $refDepth="";
35 < # Supported rtrace -o* options and data type encoders
36 < my %rtoutC = (
37 <        v =>    "radiance.hdr",
38 <        r =>    "mirrored.hdr",
39 <        x =>    "unmirrored.hdr",
40 <        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 < );
28 > my @rtraceA = split(' ', 'rtrace -u- -dt .05 -dc .5 -ds .25 -dr 1 ' .
29 >                                '-aa .2 -ar 64 -ad 512 -as 128 -lr 7 -lw 1e-03');
30 > my @vwraysA = ('vwrays', '-ff', '-pj', '.67');
31 > my @vwrightA = ('vwright', '-vtv');
32 > my @rpictA = ('rpict', '-ps', '1');
33 > my $outpatt = '^-o[vrxlLRXnNsmM]+';
34 > my $refDepth = "";
35 > my $irrad = 0;
36 > my $persist = 0;
37   my $outlyr;
38   my $outdir;
39   my $outpic;
# Line 62 | Line 42 | OPTION:                                # sort through options
42   while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
43          # Check for file inclusion
44          if ("$ARGV[0]" =~ /^\@/) {
45 <                open my $handle, '<', substr($ARGV[0], 1);
45 >                open my $handle, '<', substr($ARGV[0], 1) or die "No file for $ARGV[0]\n";
46                  shift @ARGV;
47                  chomp(my @args = <$handle>);
48                  close $handle;
# Line 72 | Line 52 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
52          # Check booleans
53          for my $boopt (@boolO) {
54                  if ("$ARGV[0]" =~ ('^' . $boopt . '[-+01tfynTFYN]?$')) {
55 <                        push @rtraceA, $ARGV[0];
76 <                        push @rpictA, shift(@ARGV);
77 <                        if ("$ARGV[0]" eq "-i") {
55 >                        if ("$ARGV[0]" eq '-i') {
56                                  $irrad = ! $irrad;
57                          } elsif ("$ARGV[0]" =~ /^-i[-+01tfynTFYN]/) {
58                                  $irrad = ("$ARGV[0]" =~ /^-i[+1tyTY]/);
59                          }
60 +                        push @rtraceA, $ARGV[0];
61 +                        push @rpictA, shift(@ARGV);
62                          next OPTION;
63                  }
64          }
# Line 97 | Line 77 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
77          }
78          # Check rtrace options
79          if (defined $rtraceC{$ARGV[0]}) {
80 +                $persist ||= ("$ARGV[0]" =~ /^-PP?$/);
81                  push @rtraceA, $ARGV[0];
82                  push @rpictA, shift(@ARGV);
83                  for (my $i = $rtraceC{$rpictA[-1]}; $i-- > 0; ) {
# Line 114 | Line 95 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
95                  next OPTION;
96          }
97          # Check for output file or number of processes
98 <        if ("$ARGV[0]" eq "-o") {
98 >        if ("$ARGV[0]" eq '-o') {
99                  shift @ARGV;
100                  $outpic = shift(@ARGV);
101 <        } elsif ("$ARGV[0]" eq "-z") {
101 >        } elsif ("$ARGV[0]" eq '-z') {
102                  push @rpictA, shift(@ARGV);
103                  $outzbf = $ARGV[0];
104                  push @rpictA, shift(@ARGV);
105 <        } elsif ("$ARGV[0]" eq "-n") {
105 >        } elsif ("$ARGV[0]" eq '-n') {
106                  shift @ARGV;
107                  $nprocs = shift(@ARGV);
108 <        } elsif ("$ARGV[0]" eq "-d") {
108 >        } elsif ("$ARGV[0]" eq '-d') {
109                  shift @ARGV;
110 <                $refDepth = " -d " . shift(@ARGV);
110 >                $refDepth = ' -d ' . shift(@ARGV);
111          } elsif ("$ARGV[0]" =~ "$outpatt") {
112                  push @rtraceA, $ARGV[0];
113                  $outlyr = substr(shift(@ARGV), 2);
# Line 135 | Line 116 | while ($#ARGV >= 0 && "$ARGV[0]" =~ /^[-\@]/) {
116                  die "Unsupported option: " . $ARGV[0] . "\n";
117          }
118   }
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 );
119   die "Number of processes must be positive" if ($nprocs <= 0);
120   if (defined $outdir) {          # check conflicting options
121          die "Options -o and -o* are mutually exclusive\n" if (defined $outpic);
# Line 150 | Line 125 | if (defined $outpic) {         # redirect output?
125          die "File '$outpic' already exists\n" if (-e $outpic);
126          open STDOUT, '>', "$outpic";
127   }
128 <                                # may as well run rpict?
129 < if ($nprocs == 1 && !defined($outdir)) {
128 > #####################################################################
129 > ##### May as well run rpict?
130 > if ($nprocs == 1 && $persist == 0 && !defined($outdir)) {
131          push(@rpictA, $ARGV[0]) if ($#ARGV == 0);
132          exec @rpictA ;
133   }
134 < push @rtraceA, ("-n", "$nprocs");
134 > # OK, we're running rtrace in some capacity...
135 > push @rtraceA, ('-n', "$nprocs");
136   die "Need single octree argument\n" if ($#ARGV != 0);
137   my $oct = $ARGV[0];
138   my $view = `@vwrightA 0`;
139 + chomp $view;
140   my @res = split(/\s/, `@vwraysA -d`);
141 < if (defined $outdir) {          # layered output directory?
142 <        my $pkg;
143 <        my ($pkgext) = ($outdir =~ /(\.[^.]+)$/);
144 <        
145 <        if ($pkgext) {
146 <                die "Unknown compressor for '$pkgext'\n" if (!defined $comprC{$pkgext});
169 <                $pkg = $outdir;
170 <                die "Output '$pkg' exists as directory!\n" if (-d $pkg);
171 <                $outdir = substr($pkg, 0, length($pkg)-length($pkgext));
172 <                if (-e $outdir) {
173 <                        die "Both '$outdir' and '$pkg' exist!\n" if (-e $pkg);
174 <                } elsif (-e $pkg) {
175 <                        system "$comprC{$pkgext}[1] '$pkg'";
176 <                        die "Cannot decompress '$pkg'\n" if ( $? );
177 <                }
178 <        }
179 <        if (! -d $outdir) {
180 <                mkdir $outdir or die("Cannot create output directory '$outdir'\n");
181 <        }
182 <                                # construct rsplit command
183 <        foreach (0..(length($outlyr) - 1)) {
184 <                my $oval=substr($outlyr, $_, 1);
185 <                $oval = "i" if ($oval eq "v" && $irrad);
186 <                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
141 > #####################################################################
142 > ##### Generating picture with depth buffer?
143 > if (defined $outzbf) {
144 >        exec "@vwraysA | @rtraceA -fff -olv @res '$oct' | " .
145 >                "rsplit -ih -iH -f -of '$outzbf' -oh -oH -of3 - | " .
146 >                "pvalue -r -df | getinfo -a 'VIEW=$view'";
147   }
148 < if (defined $outzbf) {          # generating depth buffer?
149 <        exec "@vwraysA | @rtraceA -fff -olv @res $oct | " .
150 <                "rsplit -ih -iH -f " .
151 <                        "-of $outzbf " .
207 <                        "-oh -oH -of3 '!pvalue -r -df' | " .
208 <                "getinfo -a 'VIEW=$view'";
148 > #####################################################################
149 > ##### Base case with output picture only?
150 > if (! defined $outdir) {
151 >        exec "@vwraysA | @rtraceA -ffc @res '$oct' | getinfo -a 'VIEW=$view'";
152   }
153 <                                # no depth buffer, simplest case
154 < exec "@vwraysA | @rtraceA -ffc @res $oct | getinfo -a 'VIEW=$view'";
153 > #####################################################################
154 > ##### Layered image output case
155 > my @rsplitA = ("rsplit", "'-t   '", "-ih", "-iH", "-oh", "-oH");
156 > # Supported rtrace -o* options and output file name.typ
157 > my %rtoutC = (
158 >        v =>    'radiance.hdr',
159 >        r =>    'r_refl.hdr',
160 >        x =>    'r_unrefl.hdr',
161 >        l =>    'd_effective.dpt',
162 >        L =>    'd_firstsurf.dpt',
163 >        R =>    'd_refl.dpt',
164 >        X =>    'd_unrefl.dpt',
165 >        n =>    'perturbed.nrm',
166 >        N =>    'unperturbed.nrm',
167 >        s =>    'surface.idx',
168 >        m =>    'modifier.idx',
169 >        M =>    'material.idx'
170 > );
171 > # Arguments for rsplit based on output file type
172 > my %rcodeC = (
173 >        '.hdr', ['-of3', '!pvalue -r -df -u'],
174 >        '.dpt', ['-of', "!rcode_depth$refDepth -ff"],
175 >        '.nrm', ['-of3', '!rcode_norm -ff'],
176 >        '.idx', ['-oa', '!rcode_ident "-t       "']
177 > );
178 > if ($irrad) {           # adjust actions for -i+ option
179 >        $rtoutC{'v'} = 'irradiance.hdr';
180 >        delete $rtoutC{'r'};
181 >        delete $rtoutC{'x'};
182 >        delete $rtoutC{'R'};
183 >        delete $rtoutC{'X'};
184 > }
185 > if (! -d $outdir) {
186 >        mkdir $outdir or die("Cannot create output directory '$outdir'\n");
187 > }
188 >                        # construct rsplit command
189 > foreach my $oval (split //, $outlyr) {
190 >        die "Duplicate or unsupported type '$oval' in -o$outlyr\n"
191 >                                        if (!defined $rtoutC{$oval});
192 >        my $outfile = "$outdir/$rtoutC{$oval}";
193 >        die "File '$outfile' already exists\n" if (-e $outfile);
194 >        my ($otyp) = ($rtoutC{$oval} =~ /(\.[^.]+)$/);
195 >        push @rsplitA, $rcodeC{$otyp}[0];
196 >        push @rsplitA, qq{'$rcodeC{$otyp}[1] > "$outfile"'};
197 >        delete $rtoutC{$oval};
198 > }
199 >                        # call rtrace + rsplit
200 > exec "@vwraysA | @rtraceA -fff @res '$oct' | getinfo -a 'VIEW=$view' | @rsplitA";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines