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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines