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.5 by saba, Tue Jul 5 15:49:51 1994 UTC

# Line 10 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10  
11   #include <stdio.h>
12  
13 + #include <math.h>
14 +
15 + #include "color.h"
16 +
17   #define PI      3.14159265358979323846
18  
19   extern char     *gets(), *strcpy();
16 extern double   atof();
20   extern float    *matchlamp();
21  
22                                  /* lamp parameters */
# Line 36 | Line 39 | struct {
39          int     (*check)();
40          char    *help;
41   } param[NPARAMS] = {
42 <        { "lamp type", "white", typecheck,
42 >        { "lamp type", "WHITE", typecheck,
43   "The lamp type is a string which corresponds to one of the types registered\n\
44 < in the lamp table file.  A value of \"white\" means an uncolored source,\n\
44 > in the lamp table file.  A value of \"WHITE\" means an uncolored source,\n\
45   which may be preferable because it results in a color balanced image." },
46          { "length unit", "meter", unitcheck,
47   "Unit must be one of:  \"meter\", \"centimeter\", \"foot\", or \"inch\".\n\
# Line 173 | Line 176 | compute()                      /* compute lamp radiance */
176   {
177          double  whiteval;
178  
179 <        whiteval = lumens/470./PI/area;
179 >        whiteval = lumens/area/(WHTEFFICACY*PI);
180  
181          printf("Lamp color (RGB) = %f %f %f\n",
182                          lampcolor[0]*whiteval,
# Line 205 | Line 208 | again:
208  
209   getpolygon()                    /* get projected area for a polygon */
210   {
211 <        static double   area = 1.0;
211 >        static double   parea = 1.0;
212  
213 <        getd("Polygon area", &area,
213 >        getd("Polygon area", &parea,
214                  "Enter the total radiating area of the polygon.");
215 <        area = unit2meter*unit2meter * area;
215 >        area = unit2meter*unit2meter * parea;
216          return(1);
217   }
218  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines