--- ray/src/cv/mgflib/context.c	1994/06/25 11:55:45	1.8
+++ ray/src/cv/mgflib/context.c	1995/02/24 16:50:08	1.17
@@ -26,8 +26,11 @@ static C_VERTEX		c_unvertex = C_DEFVERTEX;
 
 				/* the current contexts */
 C_COLOR		*c_ccolor = &c_uncolor;
+char		*c_ccname = NULL;
 C_MATERIAL	*c_cmaterial = &c_unmaterial;
+char		*c_cmname = NULL;
 C_VERTEX	*c_cvertex = &c_unvertex;
+char		*c_cvname = NULL;
 
 static LUTAB	clr_tab = LU_SINIT(free,free);	/* color lookup table */
 static LUTAB	mat_tab = LU_SINIT(free,free);	/* material lookup table */
@@ -58,20 +61,22 @@ register char	**av;
 		if (ac == 1) {		/* set unnamed color context */
 			c_uncolor = c_dfcolor;
 			c_ccolor = &c_uncolor;
+			c_ccname = NULL;
 			return(MG_OK);
 		}
 		lp = lu_find(&clr_tab, av[1]);	/* lookup context */
 		if (lp == NULL)
 			return(MG_EMEM);
+		c_ccname = lp->key;
+		c_ccolor = (C_COLOR *)lp->data;
 		if (ac == 2) {		/* reestablish previous context */
-			if (lp->data == NULL)
+			if (c_ccolor == NULL)
 				return(MG_EUNDEF);
-			c_ccolor = (C_COLOR *)lp->data;
 			return(MG_OK);
 		}
 		if (av[2][0] != '=' || av[2][1])
 			return(MG_ETYPE);
-		if (lp->key == NULL) {	/* create new color context */
+		if (c_ccolor == NULL) {	/* create new color context */
 			lp->key = (char *)malloc(strlen(av[1])+1);
 			if (lp->key == NULL)
 				return(MG_EMEM);
@@ -79,11 +84,14 @@ register char	**av;
 			lp->data = (char *)malloc(sizeof(C_COLOR));
 			if (lp->data == NULL)
 				return(MG_EMEM);
+			c_ccname = lp->key;
+			c_ccolor = (C_COLOR *)lp->data;
+			c_ccolor->clock = 0;
 		}
-		c_ccolor = (C_COLOR *)lp->data;
+		i = c_ccolor->clock;
 		if (ac == 3) {		/* use default template */
 			*c_ccolor = c_dfcolor;
-			c_ccolor->name = lp->key;
+			c_ccolor->clock = i + 1;
 			return(MG_OK);
 		}
 		lp = lu_find(&clr_tab, av[3]);	/* lookup template */
@@ -92,10 +100,7 @@ register char	**av;
 		if (lp->data == NULL)
 			return(MG_EUNDEF);
 		*c_ccolor = *(C_COLOR *)lp->data;
-		c_ccolor->name = lp->key;
-		c_ccolor->clock = 1;
-		if (ac > 4)
-			return(MG_EARGC);
+		c_ccolor->clock = i + 1;
 		return(MG_OK);
 	case MG_E_CXY:		/* assign CIE XY value */
 		if (ac != 3)
@@ -113,9 +118,9 @@ register char	**av;
 	case MG_E_CSPEC:	/* assign spectral values */
 		if (ac < 5)
 			return(MG_EARGC);
-		if (!isint(av[1]) || !isint(av[2]))
+		if (!isflt(av[1]) || !isflt(av[2]))
 			return(MG_ETYPE);
-		return(setspectrum(c_ccolor, atoi(av[1]), atoi(av[2]),
+		return(setspectrum(c_ccolor, atof(av[1]), atof(av[2]),
 				ac-3, av+3));
 	case MG_E_CMIX:		/* mix colors */
 		if (ac < 5 || (ac-1)%2)
@@ -144,6 +149,7 @@ register char	**av;
 					w, (C_COLOR *)lp->data);
 			wsum += w;
 		}
+		c_ccolor->clock++;
 		return(MG_OK);
 	}
 	return(MG_EUNK);
@@ -155,6 +161,7 @@ c_hmaterial(ac, av)		/* handle material entity */
 int	ac;
 register char	**av;
 {
+	int	i;
 	register LUENT	*lp;
 
 	switch (mg_entity(av[0])) {
@@ -164,20 +171,22 @@ register char	**av;
 		if (ac == 1) {		/* set unnamed material context */
 			c_unmaterial = c_dfmaterial;
 			c_cmaterial = &c_unmaterial;
+			c_cmname = NULL;
 			return(MG_OK);
 		}
 		lp = lu_find(&mat_tab, av[1]);	/* lookup context */
 		if (lp == NULL)
 			return(MG_EMEM);
+		c_cmname = lp->key;
+		c_cmaterial = (C_MATERIAL *)lp->data;
 		if (ac == 2) {		/* reestablish previous context */
-			if (lp->data == NULL)
+			if (c_cmaterial == NULL)
 				return(MG_EUNDEF);
-			c_cmaterial = (C_MATERIAL *)lp->data;
 			return(MG_OK);
 		}
 		if (av[2][0] != '=' || av[2][1])
 			return(MG_ETYPE);
-		if (lp->key == NULL) {	/* create new material context */
+		if (c_cmaterial == NULL) {	/* create new material */
 			lp->key = (char *)malloc(strlen(av[1])+1);
 			if (lp->key == NULL)
 				return(MG_EMEM);
@@ -185,11 +194,14 @@ register char	**av;
 			lp->data = (char *)malloc(sizeof(C_MATERIAL));
 			if (lp->data == NULL)
 				return(MG_EMEM);
+			c_cmname = lp->key;
+			c_cmaterial = (C_MATERIAL *)lp->data;
+			c_cmaterial->clock = 0;
 		}
-		c_cmaterial = (C_MATERIAL *)lp->data;
+		i = c_cmaterial->clock;
 		if (ac == 3) {		/* use default template */
 			*c_cmaterial = c_dfmaterial;
-			c_cmaterial->name = lp->key;
+			c_cmaterial->clock = i + 1;
 			return(MG_OK);
 		}
 		lp = lu_find(&mat_tab, av[3]);	/* lookup template */
@@ -198,10 +210,7 @@ register char	**av;
 		if (lp->data == NULL)
 			return(MG_EUNDEF);
 		*c_cmaterial = *(C_MATERIAL *)lp->data;
-		c_cmaterial->name = lp->key;
-		c_cmaterial->clock = 1;
-		if (ac > 4)
-			return(MG_EARGC);
+		c_cmaterial->clock = i + 1;
 		return(MG_OK);
 	case MG_E_RD:		/* set diffuse reflectance */
 		if (ac != 2)
@@ -262,6 +271,20 @@ register char	**av;
 		c_cmaterial->ts_c = *c_ccolor;
 		c_cmaterial->clock++;
 		return(MG_OK);
+	case MG_E_SIDES:	/* set number of sides */
+		if (ac != 2)
+			return(MG_EARGC);
+		if (!isint(av[1]))
+			return(MG_ETYPE);
+		i = atoi(av[1]);
+		if (i == 1)
+			c_cmaterial->sided = 1;
+		else if (i == 2)
+			c_cmaterial->sided = 0;
+		else
+			return(MG_EILL);
+		c_cmaterial->clock++;
+		return(MG_OK);
 	}
 	return(MG_EUNK);
 }
@@ -272,6 +295,7 @@ c_hvertex(ac, av)		/* handle a vertex entity */
 int	ac;
 register char	**av;
 {
+	int	i;
 	register LUENT	*lp;
 
 	switch (mg_entity(av[0])) {
@@ -281,20 +305,22 @@ register char	**av;
 		if (ac == 1) {		/* set unnamed vertex context */
 			c_unvertex = c_dfvertex;
 			c_cvertex = &c_unvertex;
+			c_cvname = NULL;
 			return(MG_OK);
 		}
 		lp = lu_find(&vtx_tab, av[1]);	/* lookup context */
 		if (lp == NULL)
 			return(MG_EMEM);
+		c_cvname = lp->key;
+		c_cvertex = (C_VERTEX *)lp->data;
 		if (ac == 2) {		/* reestablish previous context */
-			if (lp->data == NULL)
+			if (c_cvertex == NULL)
 				return(MG_EUNDEF);
-			c_cvertex = (C_VERTEX *)lp->data;
 			return(MG_OK);
 		}
 		if (av[2][0] != '=' || av[2][1])
 			return(MG_ETYPE);
-		if (lp->key == NULL) {	/* create new vertex context */
+		if (c_cvertex == NULL) {	/* create new vertex context */
 			lp->key = (char *)malloc(strlen(av[1])+1);
 			if (lp->key == NULL)
 				return(MG_EMEM);
@@ -302,11 +328,13 @@ register char	**av;
 			lp->data = (char *)malloc(sizeof(C_VERTEX));
 			if (lp->data == NULL)
 				return(MG_EMEM);
+			c_cvname = lp->key;
+			c_cvertex = (C_VERTEX *)lp->data;
 		}
-		c_cvertex = (C_VERTEX *)lp->data;
+		i = c_cvertex->clock;
 		if (ac == 3) {		/* use default template */
 			*c_cvertex = c_dfvertex;
-			c_cvertex->name = lp->key
+			c_cvertex->clock = i + 1;
 			return(MG_OK);
 		}
 		lp = lu_find(&vtx_tab, av[3]);	/* lookup template */
@@ -315,10 +343,7 @@ register char	**av;
 		if (lp->data == NULL)
 			return(MG_EUNDEF);
 		*c_cvertex = *(C_VERTEX *)lp->data;
-		c_cvertex->name = lp->key
-		c_cvertex->clock = 1;
-		if (ac > 4)
-			return(MG_EARGC);
+		c_cvertex->clock = i + 1;
 		return(MG_OK);
 	case MG_E_POINT:	/* set point */
 		if (ac != 4)
@@ -351,16 +376,31 @@ c_clearall()			/* empty context tables */
 {
 	c_uncolor = c_dfcolor;
 	c_ccolor = &c_uncolor;
+	c_ccname = NULL;
 	lu_done(&clr_tab);
 	c_unmaterial = c_dfmaterial;
 	c_cmaterial = &c_unmaterial;
+	c_cmname = NULL;
 	lu_done(&mat_tab);
 	c_unvertex = c_dfvertex;
 	c_cvertex = &c_unvertex;
+	c_cvname = NULL;
 	lu_done(&vtx_tab);
 }
 
 
+C_MATERIAL *
+c_getmaterial(name)		/* get a named material */
+char	*name;
+{
+	register LUENT	*lp;
+
+	if ((lp = lu_find(&mat_tab, name)) == NULL)
+		return(NULL);
+	return((C_MATERIAL *)lp->data);
+}
+
+
 C_VERTEX *
 c_getvert(name)			/* get a named vertex */
 char	*name;
@@ -405,22 +445,26 @@ int	fl;
 	double	x, y, z;
 	register int	i;
 
-	if (clr->flags & fl)		/* already done */
+	fl &= ~clr->flags;			/* ignore what's done */
+	if (!fl)				/* everything's done! */
 		return;
 	if (!(clr->flags & (C_CSXY|C_CSSPEC)))	/* nothing set! */
 		*clr = c_dfcolor;
-	else if (fl & C_CSXY) {		/* cspec -> cxy */
+	if (fl & C_CSXY) {		/* cspec -> cxy */
 		x = y = z = 0.;
 		for (i = 0; i < C_CNSS; i++) {
 			x += cie_xf.ssamp[i] * clr->ssamp[i];
 			y += cie_yf.ssamp[i] * clr->ssamp[i];
 			z += cie_zf.ssamp[i] * clr->ssamp[i];
 		}
+		x /= (double)cie_xf.ssum;
+		y /= (double)cie_yf.ssum;
+		z /= (double)cie_zf.ssum;
 		z += x + y;
 		clr->cx = x / z;
 		clr->cy = y / z;
 		clr->flags |= C_CSXY;
-	} else {			/* cxy -> cspec */
+	} else if (fl & C_CSSPEC) {	/* cxy -> cspec */
 		z = (cie_xf.ssum + cie_yf.ssum + cie_zf.ssum) / 3.;
 		x = clr->cx * z / cie_xf.ssum;
 		y = clr->cy * z / cie_yf.ssum;
@@ -433,31 +477,65 @@ int	fl;
 					z * cie_zf.ssamp[i] ;
 		clr->flags |= C_CSSPEC;
 	}
+	if (fl & C_CSEFF) {		/* compute efficacy */
+		if (clr->flags & C_CDSPEC) {		/* from spectrum */
+			y = 0.;
+			for (i = 0; i < C_CNSS; i++)
+				y += cie_yf.ssamp[i] * clr->ssamp[i];
+			clr->eff = C_CLPWM * y / clr->ssum;
+		} else /* clr->flags & C_CDXY */ {	/* from (x,y) */
+			clr->eff = clr->cx*cie_xf.eff + clr->cy*cie_yf.eff +
+					(1. - clr->cx - clr->cy)*cie_zf.eff;
+		}
+		clr->flags |= C_CSEFF;
+	}
 }
 
 
 static int
 setspectrum(clr, wlmin, wlmax, ac, av)	/* convert a spectrum */
 register C_COLOR	*clr;
-int	wlmin, wlmax;
+double	wlmin, wlmax;
 int	ac;
 char	**av;
 {
 	double	scale;
-	float	*va;
-	register int	i;
-	int	wl, pos;
+	float	va[C_CNSS];
+	register int	i, pos;
+	int	n, imax;
+	int	wl;
 	double	wl0, wlstep;
-
-	if (wlmin < C_CMINWL || wlmin >= wlmax || wlmax > C_CMAXWL)
+					/* check bounds */
+	if (wlmax <= C_CMINWL | wlmax <= wlmin | wlmin >= C_CMAXWL)
 		return(MG_EILL);
-	if ((va = (float *)malloc(ac*sizeof(float))) == NULL)
-		return(MG_EMEM);
+	wlstep = (wlmax - wlmin)/(ac-1);
+	while (wlmin < C_CMINWL) {
+		wlmin += wlstep;
+		ac--; av++;
+	}
+	while (wlmax > C_CMAXWL) {
+		wlmax -= wlstep;
+		ac--;
+	}
+	if (ac < 2)
+		return(MG_EILL);
+	imax = ac;			/* box filter if necessary */
+	if (wlstep < C_CWLI) {
+		wlstep = C_CWLI;
+		imax = (wlmax - wlmin)/wlstep;
+	}
 	scale = 0.;			/* get values and maximum */
-	for (i = 0; i < ac; i++) {
-		if (!isflt(av[i]))
-			return(MG_ETYPE);
-		va[i] = atof(av[i]);
+	pos = 0;
+	for (i = 0; i < imax; i++) {
+		va[i] = 0.; n = 0;
+		while (pos < (i+.5)*ac/imax) {
+			if (!isflt(av[pos]))
+				return(MG_ETYPE);
+			va[i] += atof(av[pos++]);
+			n++;
+		}
+		if (n > 1)
+			va[i] /= (double)n;
 		if (va[i] < 0.)
 			return(MG_EILL);
 		if (va[i] > scale)
@@ -468,17 +546,16 @@ char	**av;
 	scale = C_CMAXV / scale;
 	clr->ssum = 0;			/* convert to our spacing */
 	wl0 = wlmin;
-	wlstep = (double)(wlmax - wlmin)/(ac-1);
 	pos = 0;
 	for (i = 0, wl = C_CMINWL; i < C_CNSS; i++, wl += C_CWLI)
-		if (wl < wlmin || wl > wlmax)
+		if (wl < wlmin | wl > wlmax)
 			clr->ssamp[i] = 0;
 		else {
 			while (wl0 + wlstep < wl+FTINY) {
 				wl0 += wlstep;
 				pos++;
 			}
-			if (wl+FTINY >= wl0 && wl-FTINY <= wl0)
+			if (wl+FTINY >= wl0 & wl-FTINY <= wl0)
 				clr->ssamp[i] = scale*va[pos];
 			else		/* interpolate if necessary */
 				clr->ssamp[i] = scale / wlstep *
@@ -488,7 +565,6 @@ char	**av;
 		}
 	clr->flags = C_CDSPEC|C_CSSPEC;
 	clr->clock++;
-	free((MEM_PTR)va);
 	return(MG_OK);
 }
 
@@ -503,10 +579,10 @@ double	w1, w2;
 	register int	i;
 
 	if ((c1->flags|c2->flags) & C_CDSPEC) {		/* spectral mixing */
-		c_ccvt(c1, C_CSSPEC);
-		c_ccvt(c2, C_CSSPEC);
-		w1 /= (double)c1->ssum;
-		w2 /= (double)c2->ssum;
+		c_ccvt(c1, C_CSSPEC|C_CSEFF);
+		c_ccvt(c2, C_CSSPEC|C_CSEFF);
+		w1 /= c1->eff*c1->ssum;
+		w2 /= c2->eff*c2->ssum;
 		scale = 0.;
 		for (i = 0; i < C_CNSS; i++) {
 			cmix[i] = w1*c1->ssamp[i] + w2*c2->ssamp[i];
@@ -526,5 +602,4 @@ double	w1, w2;
 		cres->cy = (w1 + w2) * scale;
 		cres->flags = C_CDXY|C_CSXY;
 	}
-	cres->clock++;			/* record the change */
 }