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

Comparing ray/src/util/gentregvec.pl (file contents):
Revision 2.2 by greg, Tue Jun 16 17:18:38 2009 UTC vs.
Revision 2.4 by greg, Wed Jun 24 19:19:38 2009 UTC

# Line 21 | Line 21 | my @skydesc;
21   my $lightline;
22   my @sunval;
23   my $sunline;
24 + my $skyOK = 0;
25   my $srcmod;     # putting this inside loop breaks code(?!)
26   while (<>) {
27          push @skydesc, $_;
28          if (/^\w+\s+light\s+/) {
29 <                s/\s+$//; s/^.*\s//;
29 >                s/\s*$//; s/^.*\s//;
30                  $srcmod = $_;
31                  $lightline = $#skydesc;
32          } elsif (defined($srcmod) && /^($srcmod)\s+source\s/) {
33                  @sunval = split(/\s+/, $skydesc[$lightline + 3]);
34                  shift @sunval;
35                  $sunline = $#skydesc;
36 +        } elsif (/\sskyfunc\s*$/) {
37 +                $skyOK = 1;
38          }
39   }
40 < die "Empty input!\n" if (! @skydesc);
40 > die "Bad sky description!\n" if (! $skyOK);
41   # Strip out the solar source if present
42   my @sundir;
43   if (defined $sunline) {
# Line 93 | Line 96 | if (@sundir) {
96          for my $i (0..2) {
97                  my $ti = 0;
98                  while ($ndx[$i] > $tindex[$ti]) { $ti++ }
99 <                my $wt = $wtot/($ang[$i]+.02) * $somega / $tomega[$ti];
99 >                my $wt = 1/($ang[$i]+.02)/$wtot * $somega / $tomega[$ti];
100                  my @scolor = split(/\s+/, $tregval[$ndx[$i]]);
101                  for my $j (0..2) { $scolor[$j] += $wt * $sunval[$j]; }
102                  $tregval[$ndx[$i]] = "@scolor\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines