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

Comparing ray/src/cv/ies2rad.c (file contents):
Revision 1.2 by greg, Fri Dec 14 14:41:14 1990 UTC vs.
Revision 2.3 by greg, Thu May 21 09:56:36 1992 UTC

# Line 71 | Line 71 | double illumrad = 0.0;                 /* radius for illum sphere */
71   typedef struct {
72          int     type;                           /* RECT, DISK, SPHERE */
73          double  w, l, h;                        /* width, length, height */
74 <        double  area;                           /* effective radiating area */
74 >        double  area;                           /* max. projected area */
75   } SHAPE;                                /* a source shape */
76  
77   int     gargc;                          /* global argc (minus filenames) */
# Line 79 | Line 79 | char   **gargv;                        /* global argv */
79  
80   extern char     *strcpy(), *strcat(), *stradd(), *tailtrunc(), *filetrunc(),
81                  *filename(), *libname(), *fullname(), *malloc();
82 – extern double   atof();
82   extern float    *matchlamp();
83  
84  
# Line 551 | Line 550 | char   *mod, *name;
550                  perror(buf);
551                  return(-1);
552          }
553 <        if (cvdata(in, datout, 2, nangles, 1./683., bounds) != 0) {
553 >        if (cvdata(in, datout, 2, nangles, 1./WHTEFFICACY, bounds) != 0) {
554                  fprintf(stderr, "dosource: bad distribution data\n");
555                  fclose(datout);
556                  unlink(fullname(buf,name,T_DST));
# Line 696 | Line 695 | double width, length, height;
695                  shp->area = shp->w * shp->l;
696                  break;
697          case DISK:
698 +        case SPHERE:
699                  shp->area = PI/4. * shp->w * shp->w;
700                  break;
701 –        case SPHERE:
702 –                shp->area = PI * shp->w * shp->w;
703 –                break;
701          }
702          return(0);
703   }
# Line 809 | Line 806 | FILE   *in, *out;
806   int     ndim, npts[];
807   double  mult, lim[][2];
808   {
809 <        register double *pt[4];
809 >        double  *pt[4];
810          register int    i, j;
811          double  val;
812          int     total;

Diff Legend

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