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 2.6 by greg, Thu Mar 18 11:21:21 1993 UTC vs.
Revision 2.9 by greg, Mon Aug 23 10:22:42 1993 UTC

# Line 11 | Line 11 | static char SCCSid[] = "$SunId$ LBL";
11   */
12  
13   #include <stdio.h>
14 + #include <math.h>
15   #include <ctype.h>
16   #include "color.h"
17   #include "paths.h"
# Line 406 | Line 407 | char   *inpname, *outname;
407          }
408          if (lampcolor == NULL) {
409                  fprintf(stderr, "%s: warning - no lamp type\n", inpname);
410 +                fputs("# Unknown lamp type (used default)\n", outfp);
411                  lampcolor = defcolor;
412 <        }
412 >        } else if (lamptype == NULL)
413 >                fprintf(outfp,"# CIE(x,y) = (%f,%f)\n# Depreciation = %.1f%%\n",
414 >                                lampcolor[3], lampcolor[4], 100.*lampcolor[5]);
415          if (feof(inpfp)) {
416                  fprintf(stderr, "%s: not in IES format\n", inpname);
417                  goto readerr;
# Line 563 | Line 567 | char   *mod, *name;
567          else if (pmtype == PM_B)
568                  fprintf(out, "5 ");
569          else if (FEQ(bounds[1][0],90.) && FEQ(bounds[1][1],270.))
570 <                fprintf(out, "8 ");
570 >                fprintf(out, "7 ");
571          else
572 <                fprintf(out, "6 ");
572 >                fprintf(out, "5 ");
573          fprintf(out, "%s %s source.cal ",
574                          srcshape.type==SPHERE ? "corr" : "flatcorr",
575                          libname(buf,name,T_DST));
# Line 584 | Line 588 | char   *mod, *name;
588                                  fprintf(out, "src_phi2 ");
589                          else
590                                  fprintf(out, "src_phi ");
591 <                        fprintf(out, "src_theta -my ");
591 >                        fprintf(out, "src_theta ");
592                          if (FEQ(bounds[1][0],90.) && FEQ(bounds[1][1],270.))
593                                  fprintf(out, "-rz -90 ");
594                  } else

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines