ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/rcode2bmp.pl
(Generate patch)

Comparing ray/src/util/rcode2bmp.pl (file contents):
Revision 2.1 by greg, Fri Jul 26 00:34:07 2019 UTC vs.
Revision 2.4 by greg, Fri Jan 5 18:23:53 2024 UTC

# Line 41 | Line 41 | while ($#ARGV >= 0) {
41          my ($dest) = ("$ARGV[0]" =~ /^([^.]+)/);
42          $dest .= ".bmp";
43          my $cmd="";
44 <        if ("$format" =~ /^32-bit_rle_(rgb|xyz)e$/) {
44 >        if ("$format" =~ /^32-bit_rle_(rgb|xyz)e *$/) {
45                  if ($pfilt) {
46                          $cmd = $pfilt . " '$ARGV[0]' | ra_bmp -e auto - '$dest'";
47                  } else {
48                          $cmd = "ra_bmp -e auto '$ARGV[0]' '$dest'";
49                  }
50 <        } elsif ("$format" eq "16-bit_encoded_depth") {
50 >        } elsif ("$format" =~ /^Radiance_spectra *$/) {
51 >                $cmd = "rcomb -fc -c RGB '$ARGV[0]' ";
52 >                $cmd .= "| $pfilt " if ($pfilt);
53 >                $cmd .=  "| ra_bmp -e auto - '$dest'";
54 >        } elsif ("$format" =~ /^16-bit_encoded_depth *$/) {
55                  $cmd = "rcode_depth -r -ff -ho -Ho '$ARGV[0]' ";
56                  $cmd .= q{| rcalc -if -of -e 'cond=9e9-$1;$1=$1' | total -if -u};
57                  my $dmax=`$cmd`;
58                  $dmax = 2**(int(log($dmax)/log(2))+1);
59 <                my $unit=`getinfo < '$ARGV[0]' | sed -n 's/^REFDEPTH= *[0-9.]*[^0-9.]//p'`;
59 >                my $unit=`getinfo < '$ARGV[0]' | sed -n 's/^REFDEPTH= *[0-9.]*[^a-zA-Z]*//p'`;
60                  chomp $unit;
61                  $unit="Depth" if ( ! $unit );
62                  $cmd = "rcode_depth -r -ff '$ARGV[0]' | pvalue -r -df -b ";
63                  $cmd .= "| $pfilt " if ($pfilt);
64                  $cmd .= "| falsecolor -l '$unit' -m 1 -s $dmax | ra_bmp - '$dest'";
65 <        } elsif ("$format" =~ /[1-9][0-9]*-bit_indexed_name$/) {
65 >        } elsif ("$format" =~ /^[1-9][0-9]*-bit_indexed_name *$/) {
66                  $cmd = "rcode_ident -r -n '$ARGV[0]' " .
67                          "| getinfo +d -c rcalc -e 'cc(x):(.1+.8*rand(x))^2' " .
68                          q{-e '$1=cc(.398*$1-11.2);$2=cc(-1.152*$1+41.7);$3=cc(8.571*$1-8.15)' } .
69                          "| pvalue -r -d ";
70                  $cmd .= "| $pfilt " if ($pfilt);
71                  $cmd .= "| ra_bmp - '$dest'";
72 <        } elsif ("$format" eq "32-bit_encoded_normal") {
72 >        } elsif ("$format" =~ /^32-bit_encoded_normal *$/) {
73                  $cmd = "rcode_norm -r -ff '$ARGV[0]' | getinfo +d -c " .
74                          "rcalc -if3 -of -e `vwright v < '$ARGV[0]'` " .
75                                  q{-e 'dot(vx,vy,vz)=vx*$1+vy*$2+vz*$3' } .

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines