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.8 by greg, Thu Oct 24 12:17:38 1991 UTC vs.
Revision 2.6 by greg, Sat Feb 22 02:07:23 2003 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1991 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5   * Program to convert lamp color from table and compute radiance.
6   */
7  
8   #include <stdio.h>
9  
10 + #include <math.h>
11 +
12   #include "color.h"
13  
14   #define PI      3.14159265358979323846
15  
16   extern char     *gets(), *strcpy();
18 extern double   atof();
17   extern float    *matchlamp();
18  
19                                  /* lamp parameters */
# Line 38 | Line 36 | struct {
36          int     (*check)();
37          char    *help;
38   } param[NPARAMS] = {
39 <        { "lamp type", "white", typecheck,
39 >        { "lamp type", "WHITE", typecheck,
40   "The lamp type is a string which corresponds to one of the types registered\n\
41 < in the lamp table file.  A value of \"white\" means an uncolored source,\n\
41 > in the lamp table file.  A value of \"WHITE\" means an uncolored source,\n\
42   which may be preferable because it results in a color balanced image." },
43          { "length unit", "meter", unitcheck,
44   "Unit must be one of:  \"meter\", \"centimeter\", \"foot\", or \"inch\".\n\
# Line 207 | Line 205 | again:
205  
206   getpolygon()                    /* get projected area for a polygon */
207   {
208 <        static double   area = 1.0;
208 >        static double   parea = 1.0;
209  
210 <        getd("Polygon area", &area,
210 >        getd("Polygon area", &parea,
211                  "Enter the total radiating area of the polygon.");
212 <        area = unit2meter*unit2meter * area;
212 >        area = unit2meter*unit2meter * parea;
213          return(1);
214   }
215  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines