| 9 |
|
my $windoz = ($^O eq "MSWin32" or $^O eq "MSWin64"); |
| 10 |
|
use File::Temp qw/ :mktemp /; |
| 11 |
|
sub userror { |
| 12 |
< |
print STDERR "Usage: genBSDF [-n Nproc][-c Nsamp][-W][-t{3|4} Nlog2][-r \"ropts\"][-f \"x=string;y=string\"][-dim xmin xmax ymin ymax zmin zmax][{+|-}C][{+|-}f][{+|-}b][{+|-}mgf][{+|-}geom units] [input ..]\n"; |
| 12 |
> |
print STDERR "Usage: genBSDF [-n Nproc][-c Nsamp][-W][-t{3|4} Nlog2][-r \"ropts\"][-s \"x=string;y=string\"][-dim xmin xmax ymin ymax zmin zmax][{+|-}C][{+|-}f][{+|-}b][{+|-}mgf][{+|-}geom units] [input ..]\n"; |
| 13 |
|
exit 1; |
| 14 |
|
} |
| 15 |
|
my ($td,$radscn,$mgfscn,$octree,$fsender,$bsender,$receivers,$facedat,$behinddat,$rmtmp); |
| 16 |
< |
my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz); |
| 17 |
< |
if ($windoz) { |
| 16 |
> |
my ($tf,$rf,$tb,$rb,$tfx,$rfx,$tbx,$rbx,$tfz,$rfz,$tbz,$rbz,$cph); |
| 17 |
> |
my ($curphase, $recovery); |
| 18 |
> |
if ($#ARGV == 1 && "$ARGV[0]" =~ /^-rec/) { |
| 19 |
> |
$td = $ARGV[1]; |
| 20 |
> |
open(MYAVH, "< $td/savedARGV.txt") or die "$td: invalid path\n"; |
| 21 |
> |
@ARGV = <MYAVH>; |
| 22 |
> |
close MYAVH; |
| 23 |
> |
chomp @ARGV; |
| 24 |
> |
$recovery = 0; |
| 25 |
> |
if (open(MYPH, "< $td/phase.txt")) { |
| 26 |
> |
while (<MYPH>) { |
| 27 |
> |
chomp($recovery = $_); |
| 28 |
> |
} |
| 29 |
> |
close MYPH; |
| 30 |
> |
} |
| 31 |
> |
} elsif ($windoz) { |
| 32 |
|
my $tmploc = `echo \%TMP\%`; |
| 33 |
< |
chomp($tmploc); |
| 33 |
> |
chomp $tmploc; |
| 34 |
|
$td = mkdtemp("$tmploc\\genBSDF.XXXXXX"); |
| 35 |
+ |
} else { |
| 36 |
+ |
$td = mkdtemp("/tmp/genBSDF.XXXXXX"); |
| 37 |
+ |
chomp $td; |
| 38 |
+ |
} |
| 39 |
+ |
if ($windoz) { |
| 40 |
|
$radscn = "$td\\device.rad"; |
| 41 |
|
$mgfscn = "$td\\device.mgf"; |
| 42 |
|
$octree = "$td\\device.oct"; |
| 57 |
|
$rfz = "$td\\rfz.dat"; |
| 58 |
|
$tbz = "$td\\tbz.dat"; |
| 59 |
|
$rbz = "$td\\rbz.dat"; |
| 60 |
< |
chomp $td; |
| 61 |
< |
$rmtmp = "rmdir /S /Q $td"; |
| 60 |
> |
$cph = "$td\\phase.txt"; |
| 61 |
> |
$rmtmp = "rd /S /Q $td"; |
| 62 |
|
} else { |
| 44 |
– |
$td = mkdtemp("/tmp/genBSDF.XXXXXX"); |
| 45 |
– |
chomp $td; |
| 63 |
|
$radscn = "$td/device.rad"; |
| 64 |
|
$mgfscn = "$td/device.mgf"; |
| 65 |
|
$octree = "$td/device.oct"; |
| 80 |
|
$rfz = "$td/rfz.dat"; |
| 81 |
|
$tbz = "$td/tbz.dat"; |
| 82 |
|
$rbz = "$td/rbz.dat"; |
| 83 |
+ |
$cph = "$td/phase.txt"; |
| 84 |
|
$rmtmp = "rm -rf $td"; |
| 85 |
|
} |
| 86 |
|
my @savedARGV = @ARGV; |
| 87 |
< |
my $rfluxmtx = "rfluxmtx -v -ab 5 -ad 700 -lw 3e-6"; |
| 87 |
> |
my $rfluxmtx = "rfluxmtx -ab 5 -ad 700 -lw 3e-6"; |
| 88 |
|
my $wrapper = "wrapBSDF"; |
| 89 |
|
my $tensortree = 0; |
| 90 |
|
my $ttlog2 = 4; |
| 122 |
|
} elsif ("$ARGV[0]" eq "-t") { |
| 123 |
|
# Use value < 0 for rttree_reduce bypass |
| 124 |
|
$pctcull = $ARGV[1]; |
| 125 |
+ |
if ($pctcull >= 100) { |
| 126 |
+ |
die "Illegal -t culling percentage, must be < 100\n"; |
| 127 |
+ |
} |
| 128 |
|
shift @ARGV; |
| 129 |
|
} elsif ("$ARGV[0]" =~ /^-t[34]$/) { |
| 130 |
|
$tensortree = substr($ARGV[0], 2, 1); |
| 131 |
|
$ttlog2 = $ARGV[1]; |
| 132 |
|
shift @ARGV; |
| 133 |
< |
} elsif ("$ARGV[0]" eq "-f") { |
| 133 |
> |
} elsif ("$ARGV[0]" eq "-s") { |
| 134 |
|
$wrapper .= " -f \"$ARGV[1]\""; |
| 135 |
|
shift @ARGV; |
| 136 |
|
} elsif ("$ARGV[0]" eq "-W") { |
| 154 |
|
} |
| 155 |
|
# Check that we're actually being asked to do something |
| 156 |
|
die "Must have at least one of +forward or +backward\n" if (!$doforw && !$doback); |
| 136 |
– |
# Issue warning for unhandled reciprocity case |
| 137 |
– |
print STDERR "Warning: recommend both +forward and +backward with -t3\n" if |
| 138 |
– |
($tensortree==3 && !($doforw && $doback)); |
| 157 |
|
$wrapper .= $tensortree ? " -a t$tensortree" : " -a kf -c"; |
| 158 |
|
$wrapper .= " -u $gunit"; |
| 159 |
< |
# Get scene description and dimensions |
| 160 |
< |
if ( $mgfin ) { |
| 161 |
< |
system "mgf2rad @ARGV > $radscn"; |
| 162 |
< |
die "Could not load MGF input\n" if ( $? ); |
| 163 |
< |
} else { |
| 146 |
< |
system "xform -e @ARGV > $radscn"; |
| 147 |
< |
die "Could not load Radiance input\n" if ( $? ); |
| 148 |
< |
} |
| 149 |
< |
if ($#dim != 5) { |
| 150 |
< |
@dim = split ' ', `getbbox -h $radscn`; |
| 151 |
< |
} |
| 152 |
< |
print STDERR "Warning: Device extends into room\n" if ($dim[5] > 1e-5); |
| 153 |
< |
$wrapper .= ' -f "t=' . ($dim[5] - $dim[4]) . ';w=' . ($dim[1] - $dim[0]) . |
| 154 |
< |
';h=' . ($dim[3] - $dim[2]) . '"'; |
| 155 |
< |
# Generate octree |
| 156 |
< |
system "oconv -w $radscn > $octree"; |
| 157 |
< |
die "Could not compile scene\n" if ( $? ); |
| 158 |
< |
# Add MGF description if requested |
| 159 |
< |
if ( $geout ) { |
| 160 |
< |
open(MGFSCN, "> $mgfscn"); |
| 161 |
< |
printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2; |
| 162 |
< |
close MGFSCN; |
| 159 |
> |
if ( !defined $recovery ) { |
| 160 |
> |
# Issue warning for unhandled reciprocity case |
| 161 |
> |
print STDERR "Warning: recommend both +forward and +backward with -t3\n" if |
| 162 |
> |
($tensortree==3 && !($doforw && $doback)); |
| 163 |
> |
# Get scene description |
| 164 |
|
if ( $mgfin ) { |
| 165 |
< |
system qq{mgfilt "#,o,xf,c,cxy,cspec,cmix,m,sides,rd,td,rs,ts,ir,v,p,n,f,fh,sph,cyl,cone,prism,ring,torus" @ARGV >> $mgfscn}; |
| 165 |
> |
system "mgf2rad @ARGV > $radscn"; |
| 166 |
> |
die "Could not load MGF input\n" if ( $? ); |
| 167 |
|
} else { |
| 168 |
< |
system "rad2mgf $radscn >> $mgfscn"; |
| 168 |
> |
system "xform -e @ARGV > $radscn"; |
| 169 |
> |
die "Could not load Radiance input\n" if ( $? ); |
| 170 |
|
} |
| 168 |
– |
open(MGFSCN, ">> $mgfscn"); |
| 169 |
– |
print MGFSCN "xf\n"; |
| 170 |
– |
close MGFSCN; |
| 171 |
– |
$wrapper .= " -g $mgfscn"; |
| 171 |
|
} |
| 172 |
< |
# Create receiver & sender surfaces (rectangular) |
| 172 |
> |
if ( $#dim != 5 ) { |
| 173 |
> |
@dim = split ' ', `getbbox -h $radscn`; |
| 174 |
> |
} |
| 175 |
> |
die "Device entirely inside room!\n" if ( $dim[4] >= 0 ); |
| 176 |
> |
if ( $dim[5] > 1e-5 ) { |
| 177 |
> |
print STDERR "Warning: Device extends into room\n"; |
| 178 |
> |
} elsif ( $dim[5]*$dim[5] > .01*($dim[1]-$dim[0])*($dim[3]-$dim[2]) ) { |
| 179 |
> |
print STDERR "Warning: Device far behind Z==0 plane\n"; |
| 180 |
> |
} |
| 181 |
> |
# Assume Zmax==0 to derive thickness so pkgBSDF will work |
| 182 |
> |
$wrapper .= ' -f "t=' . (-$dim[4]) . ';w=' . ($dim[1] - $dim[0]) . |
| 183 |
> |
';h=' . ($dim[3] - $dim[2]) . '"'; |
| 184 |
> |
$wrapper .= " -g $mgfscn" if ( $geout ); |
| 185 |
> |
# Calculate CIE (u',v') from Radiance RGB: |
| 186 |
> |
my $CIEuv = 'Xi=.5141*Ri+.3239*Gi+.1620*Bi;' . |
| 187 |
> |
'Yi=.2651*Ri+.6701*Gi+.0648*Bi;' . |
| 188 |
> |
'Zi=.0241*Ri+.1229*Gi+.8530*Bi;' . |
| 189 |
> |
'den=Xi+15*Yi+3*Zi;' . |
| 190 |
> |
'uprime=4*Xi/den;vprime=9*Yi/den;' ; |
| 191 |
> |
my $FEPS = 1e-5; |
| 192 |
> |
my $ns = 2**$ttlog2; |
| 193 |
|
my $nx = int(sqrt($nsamp*($dim[1]-$dim[0])/($dim[3]-$dim[2])) + 1); |
| 194 |
|
my $ny = int($nsamp/$nx + 1); |
| 195 |
|
$nsamp = $nx * $ny; |
| 177 |
– |
my $ns = 2**$ttlog2; |
| 178 |
– |
open(RADSCN, "> $receivers"); |
| 179 |
– |
print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=sc$ns\n" : "h=kf\n"); |
| 180 |
– |
print RADSCN '#@rfluxmtx ' . "u=Y o=$facedat\n\n"; |
| 181 |
– |
print RADSCN "void glow receiver_face\n0\n0\n4 1 1 1 0\n\n"; |
| 182 |
– |
print RADSCN "receiver_face source f_receiver\n0\n0\n4 0 0 1 180\n\n"; |
| 183 |
– |
print RADSCN '#@rfluxmtx ' . "u=Y o=$behinddat\n\n"; |
| 184 |
– |
print RADSCN "void glow receiver_behind\n0\n0\n4 1 1 1 0\n\n"; |
| 185 |
– |
print RADSCN "receiver_behind source b_receiver\n0\n0\n4 0 0 -1 180\n"; |
| 186 |
– |
close RADSCN; |
| 187 |
– |
# Finish rfluxmtx command and prepare sender surfaces |
| 196 |
|
$rfluxmtx .= " -n $nproc -c $nsamp"; |
| 197 |
< |
if ( $tensortree != 3 ) { # Isotropic tensor tree is exception |
| 198 |
< |
open (RADSCN, "> $fsender"); |
| 199 |
< |
print RADSCN '#@rfluxmtx u=Y ' . ($tensortree ? "h=sc$ns\n\n" : "h=kf\n\n"); |
| 200 |
< |
print RADSCN "void polygon fwd_sender\n0\n0\n12\n"; |
| 201 |
< |
printf RADSCN "\t%f\t%f\t%f\n", $dim[0], $dim[2], $dim[4]; |
| 202 |
< |
printf RADSCN "\t%f\t%f\t%f\n", $dim[0], $dim[3], $dim[4]; |
| 203 |
< |
printf RADSCN "\t%f\t%f\t%f\n", $dim[1], $dim[3], $dim[4]; |
| 204 |
< |
printf RADSCN "\t%f\t%f\t%f\n", $dim[1], $dim[2], $dim[4]; |
| 197 |
> |
if ( !defined $recovery ) { |
| 198 |
> |
open(MYAVH, "> $td/savedARGV.txt"); |
| 199 |
> |
foreach (@savedARGV) { |
| 200 |
> |
print MYAVH "$_\n"; |
| 201 |
> |
} |
| 202 |
> |
close MYAVH; |
| 203 |
> |
# Generate octree |
| 204 |
> |
system "oconv -w $radscn > $octree"; |
| 205 |
> |
die "Could not compile scene\n" if ( $? ); |
| 206 |
> |
# Add MGF description if requested |
| 207 |
> |
if ( $geout ) { |
| 208 |
> |
open(MGFSCN, "> $mgfscn"); |
| 209 |
> |
printf MGFSCN "xf -t %.6f %.6f 0\n", -($dim[0]+$dim[1])/2, -($dim[2]+$dim[3])/2; |
| 210 |
> |
close MGFSCN; |
| 211 |
> |
if ( $mgfin ) { |
| 212 |
> |
system qq{mgfilt "#,o,xf,c,cxy,cspec,cmix,m,sides,rd,td,rs,ts,ir,v,p,n,f,fh,sph,cyl,cone,prism,ring,torus" @ARGV >> $mgfscn}; |
| 213 |
> |
} else { |
| 214 |
> |
system "rad2mgf $radscn >> $mgfscn"; |
| 215 |
> |
} |
| 216 |
> |
open(MGFSCN, ">> $mgfscn"); |
| 217 |
> |
print MGFSCN "xf\n"; |
| 218 |
> |
close MGFSCN; |
| 219 |
> |
} |
| 220 |
> |
# Create receiver & sender surfaces (rectangular) |
| 221 |
> |
open(RADSCN, "> $receivers"); |
| 222 |
> |
print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=-sc$ns\n" : "h=-kf\n"); |
| 223 |
> |
print RADSCN '#@rfluxmtx ' . "u=-Y o=$facedat\n\n"; |
| 224 |
> |
print RADSCN "void glow receiver_face\n0\n0\n4 1 1 1 0\n\n"; |
| 225 |
> |
print RADSCN "receiver_face source f_receiver\n0\n0\n4 0 0 1 180\n\n"; |
| 226 |
> |
print RADSCN '#@rfluxmtx ' . ($tensortree ? "h=+sc$ns\n" : "h=+kf\n"); |
| 227 |
> |
print RADSCN '#@rfluxmtx ' . "u=-Y o=$behinddat\n\n"; |
| 228 |
> |
print RADSCN "void glow receiver_behind\n0\n0\n4 1 1 1 0\n\n"; |
| 229 |
> |
print RADSCN "receiver_behind source b_receiver\n0\n0\n4 0 0 -1 180\n"; |
| 230 |
|
close RADSCN; |
| 231 |
< |
open (RADSCN, "> $bsender"); |
| 232 |
< |
print RADSCN '#@rfluxmtx u=Y ' . ($tensortree ? "h=sc$ns\n\n" : "h=kf\n\n"); |
| 233 |
< |
print RADSCN "void polygon fwd_sender\n0\n0\n12\n"; |
| 234 |
< |
printf RADSCN "\t%f\t%f\t%f\n", $dim[0], $dim[2], $dim[5]; |
| 235 |
< |
printf RADSCN "\t%f\t%f\t%f\n", $dim[1], $dim[2], $dim[5]; |
| 236 |
< |
printf RADSCN "\t%f\t%f\t%f\n", $dim[1], $dim[3], $dim[5]; |
| 237 |
< |
printf RADSCN "\t%f\t%f\t%f\n", $dim[0], $dim[3], $dim[5]; |
| 238 |
< |
close RADSCN; |
| 231 |
> |
# Prepare sender surfaces |
| 232 |
> |
if ( $tensortree != 3 ) { # Isotropic tensor tree is exception |
| 233 |
> |
open (RADSCN, "> $fsender"); |
| 234 |
> |
print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=-sc$ns\n\n" : "h=-kf\n\n"); |
| 235 |
> |
print RADSCN "void polygon fwd_sender\n0\n0\n12\n"; |
| 236 |
> |
printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[4]-$FEPS; |
| 237 |
> |
printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[4]-$FEPS; |
| 238 |
> |
printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[4]-$FEPS; |
| 239 |
> |
printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[4]-$FEPS; |
| 240 |
> |
close RADSCN; |
| 241 |
> |
open (RADSCN, "> $bsender"); |
| 242 |
> |
print RADSCN '#@rfluxmtx u=-Y ' . ($tensortree ? "h=+sc$ns\n\n" : "h=+kf\n\n"); |
| 243 |
> |
print RADSCN "void polygon bwd_sender\n0\n0\n12\n"; |
| 244 |
> |
printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[2], $dim[5]+$FEPS; |
| 245 |
> |
printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[2], $dim[5]+$FEPS; |
| 246 |
> |
printf RADSCN "\t%e\t%e\t%e\n", $dim[1], $dim[3], $dim[5]+$FEPS; |
| 247 |
> |
printf RADSCN "\t%e\t%e\t%e\n", $dim[0], $dim[3], $dim[5]+$FEPS; |
| 248 |
> |
close RADSCN; |
| 249 |
> |
} |
| 250 |
> |
print STDERR "Recover using: $0 -recover $td\n"; |
| 251 |
|
} |
| 252 |
+ |
# Open unbuffered progress file |
| 253 |
+ |
open(MYPH, ">> $td/phase.txt"); |
| 254 |
+ |
{ |
| 255 |
+ |
my $ofh = select MYPH; |
| 256 |
+ |
$| = 1; |
| 257 |
+ |
select $ofh; |
| 258 |
+ |
} |
| 259 |
+ |
$curphase = 0; |
| 260 |
|
# Create data segments (all the work happens here) |
| 261 |
|
if ( $tensortree ) { |
| 262 |
|
do_tree_bsdf(); |
| 264 |
|
do_matrix_bsdf(); |
| 265 |
|
} |
| 266 |
|
# Output XML |
| 214 |
– |
my $old_fh = select(STDOUT); |
| 215 |
– |
$| = 1; |
| 216 |
– |
select($old_fh); |
| 217 |
– |
print "<!-- Created by: genBSDF @savedARGV -->\n"; |
| 267 |
|
# print STDERR "Running: $wrapper\n"; |
| 268 |
< |
system $wrapper; |
| 268 |
> |
system "$wrapper -C \"Created by: genBSDF @savedARGV\""; |
| 269 |
|
die "Could not wrap BSDF data\n" if ( $? ); |
| 270 |
|
# Clean up temporary files and exit |
| 271 |
< |
system $rmtmp; |
| 271 |
> |
exec $rmtmp; |
| 272 |
|
|
| 273 |
< |
#-------------- End of main program segment --------------# |
| 273 |
> |
#============== End of main program segment ==============# |
| 274 |
|
|
| 275 |
+ |
# Function to determine if next phase should be skipped or recovered |
| 276 |
+ |
sub do_phase { |
| 277 |
+ |
$curphase++; |
| 278 |
+ |
if (defined $recovery) { |
| 279 |
+ |
if ($recovery > $curphase) { return 0; } |
| 280 |
+ |
if ($recovery == $curphase) { return -1; } |
| 281 |
+ |
} |
| 282 |
+ |
print MYPH "$curphase\n"; |
| 283 |
+ |
return 1; |
| 284 |
+ |
} |
| 285 |
+ |
|
| 286 |
|
#++++++++++++++ Tensor tree BSDF generation ++++++++++++++# |
| 287 |
|
sub do_tree_bsdf { |
| 288 |
|
|
| 295 |
|
# Call rfluxmtx and process tensor tree BSDF for the given direction |
| 296 |
|
sub do_ttree_dir { |
| 297 |
|
my $forw = shift; |
| 298 |
+ |
my $r = do_phase(); |
| 299 |
+ |
if (!$r) { return; } |
| 300 |
+ |
$r = ($r < 0) ? " -r" : ""; |
| 301 |
|
my $cmd; |
| 302 |
|
if ( $tensortree == 3 ) { |
| 303 |
|
# Isotropic BSDF |
| 313 |
|
qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } . |
| 314 |
|
qq{-e "\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz" } . |
| 315 |
|
qq{-e "\$4=Dx;\$5=Dy;\$6=myDz" } . |
| 316 |
< |
"| $rfluxmtx -fa -y $ns2 - $receivers -i $octree"; |
| 316 |
> |
"| $rfluxmtx$r -fa -y $ns2 - $receivers -i $octree"; |
| 317 |
|
} else { |
| 318 |
|
$cmd = "cnt $ns2 $ny $nx " . |
| 319 |
|
qq{| rcalc -e "r1=rand(.8681*recno-.673892)" } . |
| 325 |
|
qq{-e "zp=$dim[5-$forw]" -e "myDz=Dz*($forw*2-1)" } . |
| 326 |
|
qq{-e '\$1=xp-Dx;\$2=yp-Dy;\$3=zp-myDz' } . |
| 327 |
|
qq{-e '\$4=Dx;\$5=Dy;\$6=myDz' -of } . |
| 328 |
< |
"| $rfluxmtx -h -ff -y $ns2 - $receivers -i $octree"; |
| 328 |
> |
"| $rfluxmtx$r -h -ff -y $ns2 - $receivers -i $octree"; |
| 329 |
|
} |
| 330 |
|
} else { |
| 331 |
|
# Anisotropic BSDF |
| 332 |
|
my $sender = ($bsender,$fsender)[$forw]; |
| 333 |
|
if ($windoz) { |
| 334 |
< |
$cmd = "$rfluxmtx -fa $sender $receivers -i $octree"; |
| 334 |
> |
$cmd = "$rfluxmtx$r -fa $sender $receivers -i $octree"; |
| 335 |
|
} else { |
| 336 |
< |
$cmd = "$rfluxmtx -h -ff $sender $receivers -i $octree"; |
| 336 |
> |
$cmd = "$rfluxmtx$r -h -ff $sender $receivers -i $octree"; |
| 337 |
|
} |
| 338 |
|
} |
| 339 |
|
# print STDERR "Starting: $cmd\n"; |
| 358 |
|
my $ttyp = ("tb","tf")[$forw]; |
| 359 |
|
ttree_comp($ttyp, "Visible", $transdat, ($tb,$tf)[$forw]); |
| 360 |
|
if ( $docolor ) { |
| 361 |
< |
ttree_comp($ttyp, "CIE-X", $transdat, ($tbx,$tfx)[$forw]); |
| 362 |
< |
ttree_comp($ttyp, "CIE-Z", $transdat, ($tbz,$tfz)[$forw]); |
| 361 |
> |
ttree_comp($ttyp, "CIE-u", $transdat, ($tbx,$tfx)[$forw]); |
| 362 |
> |
ttree_comp($ttyp, "CIE-v", $transdat, ($tbz,$tfz)[$forw]); |
| 363 |
|
} |
| 364 |
|
} |
| 365 |
|
# Output reflection |
| 366 |
|
my $rtyp = ("rb","rf")[$forw]; |
| 367 |
|
ttree_comp($rtyp, "Visible", $refldat, ($rb,$rf)[$forw]); |
| 368 |
|
if ( $docolor ) { |
| 369 |
< |
ttree_comp($rtyp, "CIE-X", $refldat, ($rbx,$rfx)[$forw]); |
| 370 |
< |
ttree_comp($rtyp, "CIE-Z", $refldat, ($rbz,$rfz)[$forw]); |
| 369 |
> |
ttree_comp($rtyp, "CIE-u", $refldat, ($rbx,$rfx)[$forw]); |
| 370 |
> |
ttree_comp($rtyp, "CIE-v", $refldat, ($rbz,$rfz)[$forw]); |
| 371 |
|
} |
| 372 |
|
} # end of ttree_out() |
| 373 |
|
|
| 381 |
|
if ($windoz) { |
| 382 |
|
if ("$spec" eq "Visible") { |
| 383 |
|
$cmd = qq{rcalc -e "Omega:PI/($ns*$ns)" } . |
| 384 |
< |
q{-e "$1=(0.265*$1+0.670*$2+0.065*$3)/Omega"}; |
| 385 |
< |
} elsif ("$spec" eq "CIE-X") { |
| 386 |
< |
$cmd = qq{rcalc -e "Omega:PI/($ns*$ns)" } . |
| 387 |
< |
q{-e "$1=(0.514*$1+0.324*$2+0.162*$3)/Omega"}; |
| 388 |
< |
} elsif ("$spec" eq "CIE-Z") { |
| 389 |
< |
$cmd = qq{rcalc -e "Omega:PI/($ns*$ns)" } . |
| 390 |
< |
q{-e "$1=(0.024*$1+0.123*$2+0.853*$3)/Omega"}; |
| 384 |
> |
q{-e "Ri=$1;Gi=$2;Bi=$3" } . |
| 385 |
> |
qq{-e "$CIEuv" } . |
| 386 |
> |
q{-e "$1=Yi/Omega"}; |
| 387 |
> |
} elsif ("$spec" eq "CIE-u") { |
| 388 |
> |
$cmd = q{rcalc -e "Ri=$1;Gi=$2;Bi=$3" } . |
| 389 |
> |
qq{-e "$CIEuv" } . |
| 390 |
> |
q{-e "$1=uprime"}; |
| 391 |
> |
} elsif ("$spec" eq "CIE-v") { |
| 392 |
> |
$cmd = q{rcalc -e "Ri=$1;Gi=$2;Bi=$3" } . |
| 393 |
> |
qq{-e "$CIEuv" } . |
| 394 |
> |
q{-e "$1=vprime"}; |
| 395 |
|
} |
| 396 |
|
} else { |
| 397 |
|
if ("$spec" eq "Visible") { |
| 398 |
|
$cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " . |
| 399 |
< |
q{-e '$1=(0.265*$1+0.670*$2+0.065*$3)/Omega'}; |
| 400 |
< |
} elsif ("$spec" eq "CIE-X") { |
| 401 |
< |
$cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " . |
| 402 |
< |
q{-e '$1=(0.514*$1+0.324*$2+0.162*$3)/Omega'}; |
| 403 |
< |
} elsif ("$spec" eq "CIE-Z") { |
| 404 |
< |
$cmd = "rcalc -if3 -e 'Omega:PI/($ns*$ns)' " . |
| 405 |
< |
q{-e '$1=(0.024*$1+0.123*$2+0.853*$3)/Omega'}; |
| 399 |
> |
q{-e 'Ri=$1;Gi=$2;Bi=$3' } . |
| 400 |
> |
"-e '$CIEuv' " . |
| 401 |
> |
q{-e '$1=Yi/Omega'}; |
| 402 |
> |
} elsif ("$spec" eq "CIE-u") { |
| 403 |
> |
$cmd = q{rcalc -if3 -e 'Ri=$1;Gi=$2;Bi=$3' } . |
| 404 |
> |
"-e '$CIEuv' " . |
| 405 |
> |
q{-e '$1=uprime'}; |
| 406 |
> |
} elsif ("$spec" eq "CIE-v") { |
| 407 |
> |
$cmd = q{rcalc -if3 -e 'Ri=$1;Gi=$2;Bi=$3' } . |
| 408 |
> |
"-e '$CIEuv' " . |
| 409 |
> |
q{-e '$1=vprime'}; |
| 410 |
|
} |
| 411 |
|
} |
| 412 |
|
if ($pctcull >= 0) { |
| 413 |
|
my $avg = ( "$typ" =~ /^r[fb]/ ) ? " -a" : ""; |
| 414 |
+ |
my $pcull = ("$spec" eq "Visible") ? $pctcull : |
| 415 |
+ |
(100 - (100-$pctcull)*.25) ; |
| 416 |
|
if ($windoz) { |
| 417 |
|
$cmd = "rcollate -ho -oc 1 $src | " . |
| 418 |
|
$cmd . |
| 419 |
< |
" | rttree_reduce$avg -h -fa -t $pctcull -r $tensortree -g $ttlog2"; |
| 419 |
> |
" | rttree_reduce$avg -h -fa -t $pcull -r $tensortree -g $ttlog2"; |
| 420 |
|
} else { |
| 421 |
|
$cmd .= " -of $src " . |
| 422 |
< |
"| rttree_reduce$avg -h -ff -t $pctcull -r $tensortree -g $ttlog2"; |
| 422 |
> |
"| rttree_reduce$avg -h -ff -t $pcull -r $tensortree -g $ttlog2"; |
| 423 |
|
} |
| 424 |
|
# print STDERR "Running: $cmd\n"; |
| 425 |
|
system "$cmd > $dest"; |
| 464 |
|
# Call rfluxmtx and process tensor tree BSDF for the given direction |
| 465 |
|
sub do_matrix_dir { |
| 466 |
|
my $forw = shift; |
| 467 |
+ |
my $r = do_phase(); |
| 468 |
+ |
if (!$r) { return; } |
| 469 |
+ |
$r = ($r < 0) ? " -r" : ""; |
| 470 |
|
my $cmd; |
| 471 |
|
my $sender = ($bsender,$fsender)[$forw]; |
| 472 |
< |
$cmd = "$rfluxmtx -fd $sender $receivers -i $octree"; |
| 472 |
> |
$cmd = "$rfluxmtx$r -fd $sender $receivers -i $octree"; |
| 473 |
|
# print STDERR "Starting: $cmd\n"; |
| 474 |
|
system $cmd; |
| 475 |
|
die "Failure running rfluxmtx" if ( $? ); |
| 510 |
|
my $dest = shift; |
| 511 |
|
my $cmd = "rmtxop -fa -t"; |
| 512 |
|
if ("$spec" eq "Visible") { |
| 513 |
< |
$cmd .= " -c 0.265 0.670 0.065"; |
| 513 |
> |
$cmd .= " -c 0.2651 0.6701 0.0648"; |
| 514 |
|
} elsif ("$spec" eq "CIE-X") { |
| 515 |
< |
$cmd .= " -c 0.514 0.324 0.162"; |
| 515 |
> |
$cmd .= " -c 0.5141 0.3239 0.1620"; |
| 516 |
|
} elsif ("$spec" eq "CIE-Z") { |
| 517 |
< |
$cmd .= " -c 0.024 0.123 0.853"; |
| 517 |
> |
$cmd .= " -c 0.0241 0.1229 0.8530"; |
| 518 |
|
} |
| 519 |
|
$cmd .= " $src | rcollate -ho -oc 145"; |
| 520 |
|
# print STDERR "Running: $cmd\n"; |
| 521 |
|
system "$cmd > $dest"; |
| 522 |
< |
die "Failure running rttree_reduce" if ( $? ); |
| 522 |
> |
die "Failure running rmtxop" if ( $? ); |
| 523 |
|
if ( "$spec" ne "$curspec" ) { |
| 524 |
|
$wrapper .= " -s $spec"; |
| 525 |
|
$curspec = $spec; |
