--- ray/src/cv/ies2rad.c	1991/10/24 12:17:35	1.5
+++ ray/src/cv/ies2rad.c	1995/04/25 21:37:14	2.12
@@ -1,4 +1,4 @@
-/* Copyright (c) 1990 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -11,13 +11,57 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 #include <stdio.h>
+#include <math.h>
 #include <ctype.h>
 #include "color.h"
+#include "paths.h"
 
 #define PI		3.14159265358979323846
 					/* floating comparisons */
 #define FTINY		1e-6
 #define FEQ(a,b)	((a)<=(b)+FTINY&&(a)>=(b)-FTINY)
+					/* keywords */
+#define MAGICID		"IESNA"
+#define LMAGICID	5
+#define FIRSTREV	86
+#define LASTREV		95
+
+#define D86		0		/* keywords defined in LM-63-1986 */
+
+#define K_TST		0
+#define K_MAN		1
+#define K_LMC		2
+#define K_LMN		3
+#define K_LPC		4
+#define K_LMP		5
+#define K_BAL		6
+#define K_MTC		7
+#define K_OTH		8
+#define K_SCH		9
+#define K_MOR		10
+#define K_BLK		11
+#define K_EBK		12
+
+#define D91		((1L<<13)-1)	/* keywords defined in LM-63-1991 */
+
+#define K_LMG		13
+
+#define D95		((1L<<14)-1)	/* keywords defined in LM-63-1995 */
+
+char	k_kwd[][20] = {"TEST", "MANUFAC", "LUMCAT", "LUMINAIRE", "LAMPCAT",
+			"LAMP", "BALLAST", "MAINTCAT", "OTHER", "SEARCH",
+			"MORE", "BLOCK", "ENDBLOCK", "LUMINOUSGEOMETRY"};
+
+long k_defined[] = {D86, D86, D86, D86, D86, D91, D91, D91, D91, D95};
+
+int	filerev = FIRSTREV;
+
+#define keymatch(i,s)	(k_defined[filerev-FIRSTREV]&1L<<(i) &&\
+				k_match(k_kwd[i],s))
+
+#define checklamp(s)	(!(k_defined[filerev-FIRSTREV]&(1<<K_LMP|1<<K_LPC)) ||\
+				keymatch(K_LMP,s) || keymatch(K_LPC,s))
+
 					/* tilt specs */
 #define TLTSTR		"TILT="
 #define TLTSTRLEN	5
@@ -35,11 +79,11 @@ static char SCCSid[] = "$SunId$ LBL";
 					/* string lengths */
 #define MAXLINE		132
 #define MAXWORD		76
-#define MAXPATH		128
 					/* file types */
 #define T_RAD		".rad"
 #define T_DST		".dat"
-#define T_TLT		"+.dat"
+#define T_TLT		"%.dat"
+#define T_OCT		".oct"
 					/* shape types */
 #define RECT		1
 #define DISK		2
@@ -49,7 +93,7 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #define F_M		.3048		/* feet to meters */
 
-#define abspath(p)	((p)[0] == '/' || (p)[0] == '.')
+#define abspath(p)	(ISDIRSEP((p)[0]) || (p)[0] == '.')
 
 static char	default_name[] = "default";
 
@@ -64,25 +108,30 @@ float	defcolor[3] = {1.,1.,1.};	/* default lamp color 
 float	*lampcolor = defcolor;		/* pointer to current lamp color */
 double	multiplier = 1.0;		/* multiplier for all light sources */
 char	units[64] = "meters";		/* output units */
-double	minaspect = 0.0;		/* minimum allowed aspect ratio */
-int	maxemitters = 1;		/* maximum emitters per hemisphere */
+int	instantiate = 0;		/* instantiate geometry */
 double	illumrad = 0.0;			/* radius for illum sphere */
 
 typedef struct {
+	int	isillum;			/* do as illum */
 	int	type;				/* RECT, DISK, SPHERE */
+	double	mult;				/* candela multiplier */
 	double	w, l, h;			/* width, length, height */
 	double	area;				/* max. projected area */
-} SHAPE;				/* a source shape */
+} SRCINFO;				/* a source shape (units=meters) */
 
 int	gargc;				/* global argc (minus filenames) */
 char	**gargv;			/* global argv */
 
 extern char	*strcpy(), *strcat(), *stradd(), *tailtrunc(), *filetrunc(),
-		*filename(), *libname(), *fullname(), *malloc();
-extern double	atof();
+		*filename(), *libname(), *fullname(), *malloc(),
+		*getword(), *atos();
 extern float	*matchlamp();
 
+#define scnint(fp,ip)	cvtint(ip,getword(fp))
+#define scnflt(fp,rp)	cvtflt(rp,getword(fp))
+#define isint		isflt			/* IES allows real as integer */
 
+
 main(argc, argv)
 int	argc;
 char	*argv[];
@@ -157,19 +206,12 @@ char	*argv[];
 		case 'o':		/* output file name */
 			outfile = argv[++i];
 			break;
-		case 's':		/* square emitters */
-			minaspect = .6;
-			if (argv[i][2] == '/') {
-				maxemitters = atoi(argv[i]+3);
-				if (maxemitters < 1)
-					goto badopt;
-			}
-			break;
 		case 'i':		/* illum */
 			illumrad = atof(argv[++i]);
-			if (illumrad < MINDIM)
-				illumrad = MINDIM;
 			break;
+		case 'g':		/* instatiate geometry? */
+			instantiate = !instantiate;
+			break;
 		case 't':		/* override lamp type */
 			lamptype = argv[++i];
 			break;
@@ -285,7 +327,7 @@ char	*path, *fname, *suffix;
 	else if (abspath(fname))
 		strcpy(stradd(path, fname, 0), suffix);
 	else
-		libname(stradd(path, libdir, '/'), fname, suffix);
+		libname(stradd(path, libdir, DIRSEP), fname, suffix);
 
 	return(path);
 }
@@ -298,7 +340,7 @@ char	*path, *fname, *suffix;
 	if (abspath(fname))
 		strcpy(stradd(path, fname, 0), suffix);
 	else
-		strcpy(stradd(stradd(path, prefdir, '/'), fname, 0), suffix);
+		strcpy(stradd(stradd(path, prefdir, DIRSEP), fname, 0), suffix);
 
 	return(path);
 }
@@ -311,7 +353,7 @@ register char	*path;
 	register char	*cp;
 
 	for (cp = path; *path; path++)
-		if (*path == '/')
+		if (ISDIRSEP(*path))
 			cp = path+1;
 	return(cp);
 }
@@ -324,8 +366,10 @@ char	*path;
 	register char	*p1, *p2;
 
 	for (p1 = p2 = path; *p2; p2++)
-		if (*p2 == '/')
+		if (ISDIRSEP(*p2))
 			p1 = p2;
+	if (p1 == path && ISDIRSEP(*p1))
+		p1++;
 	*p1 = '\0';
 	return(path);
 }
@@ -362,6 +406,30 @@ char	*s;
 }
 
 
+k_match(kwd, hdl)			/* header line matches keyword? */
+register char	*kwd, *hdl;
+{
+	if (!*hdl++ == '[')
+		return(0);
+	while (islower(*hdl) ? toupper(*hdl) == *kwd++ : *hdl == *kwd++)
+		if (!*hdl++)
+			return(0);
+	return(!*kwd & *hdl == ']');
+}
+
+
+char *
+keyargs(hdl)				/* return keyword arguments */
+register char	*hdl;
+{
+	while (*hdl && *hdl++ != ']')
+		;
+	while (isspace(*hdl))
+		hdl++;
+	return(hdl);
+}
+
+
 putheader(out)				/* print header */
 FILE	*out;
 {
@@ -381,9 +449,14 @@ FILE	*out;
 ies2rad(inpname, outname)		/* convert IES file */
 char	*inpname, *outname;
 {
+	SRCINFO	srcinfo;
 	char	buf[MAXLINE], tltid[MAXWORD];
+	char	geomfile[128];
 	FILE	*inpfp, *outfp;
+	int	lineno = 0;
 
+	geomfile[0] = '\0';
+	srcinfo.isillum = 0;
 	if (inpname == NULL) {
 		inpname = "<stdin>";
 		inpfp = stdin;
@@ -404,21 +477,37 @@ char	*inpname, *outname;
 		blanktrunc(buf);
 		if (!buf[0])
 			continue;
+		if (!lineno++ && !strncmp(buf, MAGICID, LMAGICID)) {
+			filerev = atoi(buf+LMAGICID);
+			if (filerev < FIRSTREV)
+				filerev = FIRSTREV;
+			else if (filerev > LASTREV)
+				filerev = LASTREV;
+		}
 		fputs("#<", outfp);
 		fputs(buf, outfp);
 		putc('\n', outfp);
-		if (lampcolor == NULL)
-			lampcolor = matchlamp(buf);
+		if (lampcolor == NULL && checklamp(buf))
+			lampcolor = matchlamp( buf[0] == '[' ?
+						keyargs(buf) : buf );
+		if (keymatch(K_LMG, buf)) {		/* geometry file */
+			strcpy(geomfile, inpname);
+			strcpy(filename(geomfile), keyargs(buf));
+			srcinfo.isillum = 1;
+		}
 	}
 	if (lampcolor == NULL) {
 		fprintf(stderr, "%s: warning - no lamp type\n", inpname);
+		fputs("# Unknown lamp type (used default)\n", outfp);
 		lampcolor = defcolor;
-	}
+	} else if (lamptype == NULL)
+		fprintf(outfp,"# CIE(x,y) = (%f,%f)\n# Depreciation = %.1f%%\n",
+				lampcolor[3], lampcolor[4], 100.*lampcolor[5]);
 	if (feof(inpfp)) {
 		fprintf(stderr, "%s: not in IES format\n", inpname);
 		goto readerr;
 	}
-	sscanf(buf+TLTSTRLEN, "%s", tltid);
+	atos(tltid, MAXWORD, buf+TLTSTRLEN);
 	if (inpfp == stdin)
 		buf[0] = '\0';
 	else
@@ -427,16 +516,20 @@ char	*inpname, *outname;
 		fprintf(stderr, "%s: bad tilt data\n", inpname);
 		goto readerr;
 	}
-	if (dosource(inpfp, outfp, tltid, outname) != 0) {
+	if (dosource(&srcinfo, inpfp, outfp, tltid, outname) != 0) {
 		fprintf(stderr, "%s: bad luminaire data\n", inpname);
 		goto readerr;
 	}
-	fclose(outfp);
 	fclose(inpfp);
+					/* cvgeometry closes outfp */
+	if (cvgeometry(geomfile, &srcinfo, outname, outfp) != 0) {
+		fprintf(stderr, "%s: bad geometry file\n", geomfile);
+		return(-1);
+	}
 	return(0);
 readerr:
-	fclose(outfp);
 	fclose(inpfp);
+	fclose(outfp);
 	unlink(fullname(buf,outname,T_RAD));
 	return(-1);
 }
@@ -458,10 +551,10 @@ char	*dir, *tltspec, *dfltname, *tltid;
 		datin = in;
 		strcpy(tltname, dfltname);
 	} else {
-		if (tltspec[0] == '/')
+		if (ISDIRSEP(tltspec[0]))
 			strcpy(buf, tltspec);
 		else
-			strcpy(stradd(buf, dir, '/'), tltspec);
+			strcpy(stradd(buf, dir, DIRSEP), tltspec);
 		if ((datin = fopen(buf, "r")) == NULL) {
 			perror(buf);
 			return(-1);
@@ -475,7 +568,7 @@ char	*dir, *tltspec, *dfltname, *tltid;
 				fclose(datin);
 			return(-1);
 		}
-		if (fscanf(datin, "%d %d", &tlt_type, &nangles) != 2
+		if (!scnint(datin,&tlt_type) || !scnint(datin,&nangles)
 			|| cvdata(datin,datout,1,&nangles,1.,minmax) != 0) {
 			fprintf(stderr, "%s: data format error\n", tltspec);
 			fclose(datout);
@@ -515,11 +608,11 @@ char	*dir, *tltspec, *dfltname, *tltid;
 }
 
 
-dosource(in, out, mod, name)		/* create source and distribution */
+dosource(sinf, in, out, mod, name)	/* create source and distribution */
+SRCINFO	*sinf;
 FILE	*in, *out;
 char	*mod, *name;
 {
-	SHAPE	srcshape;
 	char	buf[MAXPATH], id[MAXWORD];
 	FILE	*datout;
 	double	mult, bfactor, pfactor, width, length, height, wattage;
@@ -527,13 +620,16 @@ char	*mod, *name;
 	int	nangles[2], pmtype, unitype;
 	double	d1;
 
-	if (fscanf(in, "%*d %*f %lf %d %d %d %d %lf %lf %lf %lf %lf %lf",
-			&mult, &nangles[0], &nangles[1], &pmtype, &unitype,
-			&width, &length, &height, &bfactor, &pfactor,
-			&wattage) != 11) {
+	if (!isint(getword(in)) || !isflt(getword(in)) || !scnflt(in,&mult)
+			|| !scnint(in,&nangles[0]) || !scnint(in,&nangles[1])
+			|| !scnint(in,&pmtype) || !scnint(in,&unitype)
+			|| !scnflt(in,&width) || !scnflt(in,&length)
+			|| !scnflt(in,&height) || !scnflt(in,&bfactor)
+			|| !scnflt(in,&pfactor) || !scnflt(in,&wattage)) {
 		fprintf(stderr, "dosource: bad lamp specification\n");
 		return(-1);
 	}
+	sinf->mult = multiplier*mult*bfactor*pfactor;
 	if (nangles[0] < 2 || nangles[1] < 1) {
 		fprintf(stderr, "dosource: too few measured angles\n");
 		return(-1);
@@ -543,7 +639,7 @@ char	*mod, *name;
 		length *= F_M;
 		height *= F_M;
 	}
-	if (makeshape(&srcshape, width, length, height) != 0) {
+	if (makeshape(sinf, width, length, height) != 0) {
 		fprintf(stderr, "dosource: illegal source dimensions");
 		return(-1);
 	}
@@ -567,11 +663,11 @@ char	*mod, *name;
 	else if (pmtype == PM_B)
 		fprintf(out, "5 ");
 	else if (FEQ(bounds[1][0],90.) && FEQ(bounds[1][1],270.))
-		fprintf(out, "8 ");
+		fprintf(out, "7 ");
 	else
-		fprintf(out, "6 ");
+		fprintf(out, "5 ");
 	fprintf(out, "%s %s source.cal ",
-			srcshape.type==SPHERE ? "corr" : "flatcorr",
+			sinf->type==SPHERE ? "corr" : "flatcorr",
 			libname(buf,name,T_DST));
 	if (pmtype == PM_B) {
 		if (FEQ(bounds[1][0],0.))
@@ -588,14 +684,14 @@ char	*mod, *name;
 				fprintf(out, "src_phi2 ");
 			else
 				fprintf(out, "src_phi ");
-			fprintf(out, "src_theta -my ");
+			fprintf(out, "src_theta ");
 			if (FEQ(bounds[1][0],90.) && FEQ(bounds[1][1],270.))
 				fprintf(out, "-rz -90 ");
 		} else
 			fprintf(out, "src_theta ");
 	}
-	fprintf(out, "\n0\n1 %g\n", multiplier*mult*bfactor*pfactor);
-	if (putsource(&srcshape, out, id, filename(name),
+	fprintf(out, "\n0\n1 %g\n", sinf->mult);
+	if (putsource(sinf, out, id, filename(name),
 			bounds[0][0]<90., bounds[0][1]>90.) != 0)
 		return(-1);
 	return(0);
@@ -603,7 +699,7 @@ char	*mod, *name;
 
 
 putsource(shp, fp, mod, name, dolower, doupper)		/* put out source */
-SHAPE	*shp;
+SRCINFO	*shp;
 FILE	*fp;
 char	*mod, *name;
 int	dolower, doupper;
@@ -611,19 +707,23 @@ int	dolower, doupper;
 	char	buf[MAXWORD];
 	
 	fprintf(fp, "\n%s %s %s_light\n", mod,
-			illumrad>=MINDIM/2. ? "illum" : "light",
+			shp->isillum ? "illum" : "light",
 			name);
 	fprintf(fp, "0\n0\n3 %g %g %g\n",
 			lampcolor[0]/shp->area,
 			lampcolor[1]/shp->area,
 			lampcolor[2]/shp->area);
-	if (doupper && dolower && shp->type != SPHERE && shp->h > MINDIM) {
-		fprintf(fp, "\n%s glow %s_glow\n", mod, name);
-		fprintf(fp, "0\n0\n4 %g %g %g 0\n",
-				lampcolor[0]/shp->area,
-				lampcolor[1]/shp->area,
-				lampcolor[2]/shp->area);
-	}
+	if (doupper && dolower && shp->type != SPHERE && shp->h > MINDIM)
+		if (shp->isillum) {
+			fprintf(fp, "\nvoid illum %s_glow\n", name);
+			fprintf(fp, "0\n0\n3 0 0 0\n");
+		} else {
+			fprintf(fp, "\n%s glow %s_glow\n", mod, name);
+			fprintf(fp, "0\n0\n4 %g %g %g -1\n",
+					lampcolor[0]/shp->area,
+					lampcolor[1]/shp->area,
+					lampcolor[2]/shp->area);
+		}
 	switch (shp->type) {
 	case RECT:
 		strcat(strcpy(buf, name), "_light");
@@ -657,12 +757,13 @@ int	dolower, doupper;
 
 
 makeshape(shp, width, length, height)		/* make source shape */
-register SHAPE	*shp;
+register SRCINFO	*shp;
 double	width, length, height;
 {
-	if (illumrad >= MINDIM/2.) {
+	if (illumrad/meters2out >= MINDIM/2.) {
+		shp->isillum = 1;
 		shp->type = SPHERE;
-		shp->w = shp->l = shp->h = 2.*illumrad;
+		shp->w = shp->l = shp->h = 2.*illumrad / meters2out;
 	} else if (width < MINDIM) {
 		width = -width;
 		if (width < MINDIM) {
@@ -705,7 +806,7 @@ double	width, length, height;
 
 
 putrectsrc(shp, fp, mod, name, up)		/* rectangular source */
-SHAPE	*shp;
+SRCINFO	*shp;
 FILE	*fp;
 char	*mod, *name;
 int	up;
@@ -718,7 +819,7 @@ int	up;
 
 
 putsides(shp, fp, mod, name)			/* put out sides of box */
-register SHAPE	*shp;
+register SRCINFO	*shp;
 FILE	*fp;
 char	*mod, *name;
 {
@@ -730,7 +831,7 @@ char	*mod, *name;
 	
 
 putrect(shp, fp, mod, name, suffix, a, b, c, d)	/* put out a rectangle */
-SHAPE	*shp;
+SRCINFO	*shp;
 FILE	*fp;
 char	*mod, *name, *suffix;
 int	a, b, c, d;
@@ -744,7 +845,7 @@ int	a, b, c, d;
 
 
 putpoint(shp, fp, p)				/* put out a point */
-register SHAPE	*shp;
+register SRCINFO	*shp;
 FILE	*fp;
 int	p;
 {
@@ -758,7 +859,7 @@ int	p;
 
 
 putdisksrc(shp, fp, mod, name, up)		/* put out a disk source */
-register SHAPE	*shp;
+register SRCINFO	*shp;
 FILE	*fp;
 char	*mod, *name;
 int	up;
@@ -780,7 +881,7 @@ int	up;
 
 
 putcyl(shp, fp, mod, name)			/* put out a cylinder */
-register SHAPE	*shp;
+register SRCINFO	*shp;
 FILE	*fp;
 char	*mod, *name;
 {
@@ -793,7 +894,7 @@ char	*mod, *name;
 
 
 putspheresrc(shp, fp, mod, name)		/* put out a sphere source */
-SHAPE	*shp;
+SRCINFO	*shp;
 FILE	*fp;
 char	*mod, *name;
 {
@@ -807,7 +908,7 @@ FILE	*in, *out;
 int	ndim, npts[];
 double	mult, lim[][2];
 {
-	register double	*pt[4];
+	double	*pt[4];
 	register int	i, j;
 	double	val;
 	int	total;
@@ -823,7 +924,8 @@ double	mult, lim[][2];
 	for (i = 0; i < ndim; i++) {
 		pt[i] = (double *)malloc(npts[i]*sizeof(double));
 		for (j = 0; j < npts[i]; j++)
-			fscanf(in, "%lf", &pt[i][j]);
+			if (!scnflt(in, &pt[i][j]))
+				return(-1);
 		if (lim != NULL) {
 			lim[i][0] = pt[i][0];
 			lim[i][1] = pt[i][npts[i]-1];
@@ -854,10 +956,114 @@ double	mult, lim[][2];
 	for (i = 0; i < total; i++) {
 		if (i%4 == 0)
 			putc('\n', out);
-		if (fscanf(in, "%lf", &val) != 1)
+		if (!scnflt(in, &val))
 			return(-1);
 		fprintf(out, "\t%g", val*mult);
 	}
 	putc('\n', out);
+	return(0);
+}
+
+
+char *
+getword(fp)			/* scan a word from fp */
+register FILE	*fp;
+{
+	static char	word[MAXWORD];
+	register char	*cp;
+	register int	c;
+
+	while (isspace(c=getc(fp)))
+		;
+	for (cp = word; c != EOF && cp < word+MAXWORD-1;
+			*cp++ = c, c = getc(fp))
+		if (isspace(c) || c == ',') {
+			while (isspace(c))
+				c = getc(fp);
+			if (c != EOF & c != ',')
+				ungetc(c, fp);
+			*cp = '\0';
+			return(word);
+		}
+	*cp = '\0';
+	return(cp > word ? word : NULL);
+}
+
+
+cvtint(ip, word)		/* convert a word to an integer */
+int	*ip;
+char	*word;
+{
+	if (word == NULL || !isint(word))
+		return(0);
+	*ip = atoi(word);
+	return(1);
+}
+
+
+cvtflt(rp, word)		/* convert a word to a double */
+double	*rp;
+char	*word;
+{
+	if (word == NULL || !isflt(word))
+		return(0);
+	*rp = atof(word);
+	return(1);
+}
+
+
+cvgeometry(inpname, sinf, outname, outfp)
+char	*inpname;
+register SRCINFO	*sinf;
+char	*outname;
+FILE	*outfp;			/* close output file upon return */
+{
+	char	buf[256];
+	register char	*cp;
+
+	if (inpname == NULL || !inpname[0]) {	/* no geometry file */
+		fclose(outfp);
+		return(0);
+	}
+	putc('\n', outfp);
+	strcpy(buf, "mgf2rad ");		/* build mgf2rad command */
+	cp = buf+8;
+	if (!FEQ(sinf->mult, 1.0)) {
+		sprintf(cp, "-m %f ", sinf->mult);
+		cp += strlen(cp);
+	}
+	sprintf(cp, "-g %f %s ",
+		sqrt(sinf->w*sinf->w + sinf->h*sinf->h + sinf->l*sinf->l),
+			inpname);
+	cp += strlen(cp);
+	if (instantiate) {		/* instantiate octree */
+		strcpy(cp, "| oconv - > ");
+		cp += 12;
+		fullname(cp,outname,T_OCT);
+		if (system(buf)) {		/* create octree */
+			fclose(outfp);
+			return(-1);
+		}
+		fprintf(outfp, "void instance %s_inst\n", outname);
+		if (!FEQ(meters2out, 1.0))
+			fprintf(outfp, "3 %s -s %f\n",
+					libname(buf,outname,T_OCT),
+					meters2out);
+		else
+			fprintf(outfp, "1 %s\n", libname(buf,outname,T_OCT));
+		fprintf(outfp, "0\n0\n");
+		fclose(outfp);
+	} else {			/* else append to luminaire file */
+		fclose(outfp);
+		if (!FEQ(meters2out, 1.0)) {	/* apply scalefactor */
+			sprintf(cp, "| xform -s %f ", meters2out);
+			cp += strlen(cp);
+		}
+		strcpy(cp, ">> ");		/* append works for DOS? */
+		cp += 3;
+		fullname(cp,outname,T_RAD);
+		if (system(buf))
+			return(-1);
+	}
 	return(0);
 }