--- ray/src/util/genskyvec.pl	2009/07/02 02:13:08	2.1
+++ ray/src/util/genskyvec.pl	2011/01/27 22:28:12	2.5
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# RCSid $Id: genskyvec.pl,v 2.1 2009/07/02 02:13:08 greg Exp $
+# RCSid $Id: genskyvec.pl,v 2.5 2011/01/27 22:28:12 greg Exp $
 #
 # Generate Reinhart vector for a given sky description
 #
@@ -7,10 +7,14 @@
 #
 use strict;
 my @skycolor = (0.960, 1.004, 1.118);
+my $mf = 4;
 while ($#ARGV >= 0) {
 	if ("$ARGV[0]" eq "-c") {
 		@skycolor = @ARGV[1..3];
 		shift @ARGV; shift @ARGV; shift @ARGV;
+	} elsif ("$ARGV[0]" eq "-m") {
+		$mf = $ARGV[1];
+		shift @ARGV;
 	}
 	shift @ARGV;
 }
@@ -28,7 +32,7 @@ while (<>) {
 		$srcmod = $_;
 		$lightline = $#skydesc;
 	} elsif (defined($srcmod) && /^($srcmod)\s+source\s/) {
-		@sunval = split(/\s+/, $skydesc[$lightline + 3]);
+		@sunval = split(' ', $skydesc[$lightline + 3]);
 		shift @sunval;
 		$sunline = $#skydesc;
 	} elsif (/\sskyfunc\s*$/) {
@@ -39,7 +43,7 @@ die "Bad sky description!\n" if (! $skyOK);
 # Strip out the solar source if present
 my @sundir;
 if (defined $sunline) {
-	@sundir = split(/\s+/, $skydesc[$sunline + 3]);
+	@sundir = split(' ', $skydesc[$sunline + 3]);
 	shift @sundir;
 	undef @sundir if ($sundir[2] <= 0);
 	splice(@skydesc, $sunline, 5);
@@ -48,7 +52,6 @@ if (defined $sunline) {
 my $rhcal = '
 DEGREE : PI/180;
 x1 = .5; x2 = .5;
-MF : 2^2;
 alpha : 90/(MF*7 + .5);
 tnaz(r) : select(r, 30, 30, 24, 24, 18, 12, 6);
 rnaz(r) : if(r-(7*MF-.5), 1, MF*tnaz(floor((r+.5)/MF) + 1));
@@ -56,12 +59,12 @@ raccum(r) : if(r-.5, rnaz(r-1) + raccum(r-1), 0);
 RowMax : 7*MF + 1;
 Rmax : raccum(RowMax);
 Rfindrow(r, rem) : if(rem-rnaz(r)-.5, Rfindrow(r+1, rem-rnaz(r)), r);
-Rrow = if(Rbin-(Rmax +.5), RowMax, Rfindrow(0, Rbin));
+Rrow = if(Rbin-(Rmax-.5), RowMax-1, Rfindrow(0, Rbin));
 Rcol = Rbin - raccum(Rrow) - 1;
 Razi_width = 2*PI / rnaz(Rrow);
 RAH : alpha*DEGREE;
 Razi = if(Rbin-.5, (Rcol + x2 - .5)*Razi_width, 2*PI*x2);
-Ralt = if(Rbin-.5, (Rrow + x1)*RAH, asin(2*x1-1));
+Ralt = if(Rbin-.5, (Rrow + x1)*RAH, asin(-x1));
 Romega = if(.5-Rbin, 2*PI, if(Rmax-.5-Rbin, 
 	Razi_width*(sin(RAH*(Rrow+1)) - sin(RAH*Rrow)),
 	2*PI*(1 - cos(RAH/2)) ) );
@@ -70,7 +73,8 @@ Dx = sin(Razi)*cos_ralt;
 Dy = cos(Razi)*cos_ralt;
 Dz = sin(Ralt);
 ';
-my $nbins = 2306;	# This needs to be consistent with MF setting above
+my $nbins = `rcalc -n -e MF:$mf -e \'$rhcal\' -e \'\$1=Rmax+1\'`;
+chomp $nbins;
 # Create octree for rtrace
 my $octree = "/tmp/gtv$$.oct";
 open OCONV, "| oconv - > $octree";
@@ -79,7 +83,7 @@ print OCONV "skyfunc glow skyglow 0 0 4 @skycolor 0\n"
 print OCONV "skyglow source sky 0 0 4 0 0 1 360\n";
 close OCONV;
 # Run rtrace and average output for every 16 samples
-my $tregcommand = "cnt $nbins 16 | rcalc -of -e '$rhcal' " .
+my $tregcommand = "cnt $nbins 16 | rcalc -of -e MF:$mf -e '$rhcal' " .
 	q{-e 'Rbin=$1;x1=rand(recno*.37-5.3);x2=rand(recno*-1.47+.86)' } .
 	q{-e '$1=0;$2=0;$3=0;$4=Dx;$5=Dy;$6=Dz' } .
 	"| rtrace -h -ff -ab 0 -w $octree | total -if3 -16 -m";
@@ -89,7 +93,8 @@ unlink $octree;
 my @bestdir;
 if (@sundir) {
 	my $somega = ($sundir[3]/360)**2 * 3.141592654**3;
-	my $cmd = "cnt $nbins | rcalc -e '$rhcal' -e Rbin=recno " .
+	my $cmd = "cnt " . ($nbins-1) .
+		" | rcalc -e MF:$mf -e '$rhcal' -e Rbin=recno " .
 		"-e 'dot=Dx*$sundir[0] + Dy*$sundir[1] + Dz*$sundir[2]' " .
 		"-e 'cond=dot-.866' " .
 		q{-e '$1=if(1-dot,acos(dot),0);$2=Romega;$3=recno' };
@@ -97,14 +102,14 @@ if (@sundir) {
 	my (@ang, @dom, @ndx);
 	my $wtot = 0;
 	for my $i (0..2) {
-		($ang[$i], $dom[$i], $ndx[$i]) = split(/\s+/, $bestdir[$i]);
+		($ang[$i], $dom[$i], $ndx[$i]) = split(' ', $bestdir[$i]);
 		$wtot += 1./($ang[$i]+.02);
 	}
 	for my $i (0..2) {
 		my $wt = 1./($ang[$i]+.02)/$wtot * $somega / $dom[$i];
-		my @scolor = split(/\s+/, $tregval[$ndx[$i]]);
+		my @scolor = split(' ', $tregval[$ndx[$i]]);
 		for my $j (0..2) { $scolor[$j] += $wt * $sunval[$j]; }
-		$tregval[$ndx[$i]] = "@scolor\n";
+		$tregval[$ndx[$i]] = "$scolor[0]\t$scolor[1]\t$scolor[2]\n";
 	}
 }
 # Output our final vector