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

Comparing ray/src/util/genambpos.pl (file contents):
Revision 2.3 by greg, Sat Apr 26 04:02:03 2014 UTC vs.
Revision 2.4 by greg, Thu May 1 02:52:03 2014 UTC

# Line 41 | Line 41 | my $cmd = "getinfo < $ARGV[0] " .
41                  q[| sed -n 's/^.* -aa \([.0-9][^ ]*\) .*$/\1/p'];
42   my $ambacc=`$cmd`;
43   die "Missing -aa setting in header\n" if (! $ambacc );
44 < $scale *= $ambacc**.25;
45 < my $outfmt = '
44 > $scale *= $ambacc;
45 > my $ambfmt = '
46   void glow posglow
47   0
48   0
# Line 52 | Line 52 | posglow sphere position${recno}
52   0
53   0
54   4 ${px} ${py} ${pz} ${psiz}
55 <
55 > ';
56 > my $posgradfmt = '
57   void glow arrglow
58   0
59   0
# Line 65 | Line 66 | arrglow cone pgarrow${recno}
66          ${ cx0 }        ${ cy0 }        ${ cz0 }
67          ${ cx1 }        ${ cy1 }        ${ cz1 }
68          ${ cr0 }        0
69 < ';
69 < my $posgradfmt = '
69 >
70   void brightfunc pgpat
71   2 posfunc ambpos.cal
72   0
# Line 91 | Line 91 | pgeval polygon pgellipse${recno}
91          ${ px3 } ${ py3 } ${ pz3 }
92          ${ px4 } ${ py4 } ${ pz4 }
93   ';
94 < $outfmt .= $posgradfmt if ($doposgrad);
95 < my $dirgradfmt='
94 > $posgradfmt .= '
95   void glow tipglow
96   0
97   0
# Line 102 | Line 101 | tipglow sphere atip
101   0
102   0
103   4 ${ cx1 } ${ cy1 } ${ cz1 } ${psiz/7}
104 <
104 > ' if ($dodirgrad);
105 > my $dirgradfmt='
106   void brightfunc dgpat
107   2 dirfunc ambpos.cal
108   0
# Line 117 | Line 117 | dgval ring dgdisk${recno}a
117   0
118   0
119   8
120 <        ${ px+dgx*.0001 } ${ py+dgy*.0001 } ${ pz+dgz*.0001 }
120 >        ${ px+dgx*.001 } ${ py+dgy*.001 } ${ pz+dgz*.001 }
121          ${ dgx } ${ dgy } ${ dgz }
122          0       ${ r0/2 }
123  
# Line 125 | Line 125 | dgval ring dgdisk${recno}b
125   0
126   0
127   8
128 <        ${ px-dgx*.0001 } ${ py-dgy*.0001 } ${ pz-dgz*.0001 }
128 >        ${ px-dgx*.001 } ${ py-dgy*.001 } ${ pz-dgz*.001 }
129          ${ -dgx } ${ -dgy } ${ -dgz }
130          0       ${ r0/2 }
131   ';
132 – $outfmt .= $dirgradfmt if ($dodirgrad);
132   # Load & convert ambient values
133   print "# Output produced by: $savedARGV\n";
134   system "lookamb -h -d $ARGV[0] | rcalc -e 'LV:$lvlsel;MW:$minwt;SF:$scale'" .
135 <                " -f rambpos.cal -o '$outfmt'";
135 >                " -f rambpos.cal -e cond=acond -o '$ambfmt'";
136 > if ($doposgrad) {
137 >        system "lookamb -h -d $ARGV[0] " .
138 >                "| rcalc -e 'LV:$lvlsel;MW:$minwt;SF:$scale'" .
139 >                " -f rambpos.cal -e cond=pcond -o '$posgradfmt'";
140 > }
141 > if ($dodirgrad) {
142 >        system "lookamb -h -d $ARGV[0] " .
143 >                "| rcalc -e 'LV:$lvlsel;MW:$minwt;SF:$scale'" .
144 >                " -f rambpos.cal -e cond=dcond -o '$dirgradfmt'";
145 > }
146   exit;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines