ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/cv/lampcolor.c
(Generate patch)

Comparing ray/src/cv/lampcolor.c (file contents):
Revision 1.7 by greg, Tue Oct 22 09:38:17 1991 UTC vs.
Revision 2.2 by greg, Thu Dec 19 15:06:15 1991 UTC

# Line 10 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10  
11   #include <stdio.h>
12  
13 + #include "color.h"
14 +
15   #define PI      3.14159265358979323846
16  
17   extern char     *gets(), *strcpy();
18 + #ifndef atof
19   extern double   atof();
20 + #endif
21   extern float    *matchlamp();
22  
23                                  /* lamp parameters */
# Line 173 | Line 177 | compute()                      /* compute lamp radiance */
177   {
178          double  whiteval;
179  
180 <        whiteval = lumens/470./PI/area;
180 >        whiteval = lumens/area/(WHTEFFICACY*PI);
181  
182          printf("Lamp color (RGB) = %f %f %f\n",
183                          lampcolor[0]*whiteval,
# Line 205 | Line 209 | again:
209  
210   getpolygon()                    /* get projected area for a polygon */
211   {
212 <        static double   area = 1.0;
212 >        static double   parea = 1.0;
213  
214 <        getd("Polygon area", &area,
214 >        getd("Polygon area", &parea,
215                  "Enter the total radiating area of the polygon.");
216 <        area = unit2meter*unit2meter * area;
216 >        area = unit2meter*unit2meter * parea;
217          return(1);
218   }
219  

Diff Legend

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