--- ray/src/cv/mgflib/context.c	1994/09/02 16:04:19	1.16
+++ ray/src/cv/mgflib/context.c	1995/03/07 14:53:20	1.18
@@ -42,6 +42,7 @@ static C_COLOR	cie_yf = C_CIEY;
 static C_COLOR	cie_zf = C_CIEZ;
 
 static int	setspectrum();
+static int	setbbtemp();
 static void	mixcolors();
 
 
@@ -105,7 +106,7 @@ register char	**av;
 	case MG_E_CXY:		/* assign CIE XY value */
 		if (ac != 3)
 			return(MG_EARGC);
-		if (!isflt(av[1]) || !isflt(av[2]))
+		if (!isflt(av[1]) | !isflt(av[2]))
 			return(MG_ETYPE);
 		c_ccolor->cx = atof(av[1]);
 		c_ccolor->cy = atof(av[2]);
@@ -118,10 +119,16 @@ 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_CCT:		/* assign black body spectrum */
+		if (ac != 2)
+			return(MG_EARGC);
+		if (!isflt(av[1]))
+			return(MG_ETYPE);
+		return(setbbtemp(c_ccolor, atof(av[1])));
 	case MG_E_CMIX:		/* mix colors */
 		if (ac < 5 || (ac-1)%2)
 			return(MG_EARGC);
@@ -248,7 +255,7 @@ register char	**av;
 	case MG_E_RS:		/* set specular reflectance */
 		if (ac != 3)
 			return(MG_EARGC);
-		if (!isflt(av[1]) || !isflt(av[2]))
+		if (!isflt(av[1]) | !isflt(av[2]))
 			return(MG_ETYPE);
 		c_cmaterial->rs = atof(av[1]);
 		c_cmaterial->rs_a = atof(av[2]);
@@ -261,7 +268,7 @@ register char	**av;
 	case MG_E_TS:		/* set specular transmittance */
 		if (ac != 3)
 			return(MG_EARGC);
-		if (!isflt(av[1]) || !isflt(av[2]))
+		if (!isflt(av[1]) | !isflt(av[2]))
 			return(MG_ETYPE);
 		c_cmaterial->ts = atof(av[1]);
 		c_cmaterial->ts_a = atof(av[2]);
@@ -348,7 +355,7 @@ register char	**av;
 	case MG_E_POINT:	/* set point */
 		if (ac != 4)
 			return(MG_EARGC);
-		if (!isflt(av[1]) || !isflt(av[2]) || !isflt(av[3]))
+		if (!isflt(av[1]) | !isflt(av[2]) | !isflt(av[3]))
 			return(MG_ETYPE);
 		c_cvertex->p[0] = atof(av[1]);
 		c_cvertex->p[1] = atof(av[2]);
@@ -358,7 +365,7 @@ register char	**av;
 	case MG_E_NORMAL:	/* set normal */
 		if (ac != 4)
 			return(MG_EARGC);
-		if (!isflt(av[1]) || !isflt(av[2]) || !isflt(av[3]))
+		if (!isflt(av[1]) | !isflt(av[2]) | !isflt(av[3]))
 			return(MG_ETYPE);
 		c_cvertex->n[0] = atof(av[1]);
 		c_cvertex->n[1] = atof(av[2]);
@@ -457,6 +464,9 @@ int	fl;
 			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;
@@ -471,7 +481,7 @@ int	fl;
 			clr->ssum += clr->ssamp[i] =
 					x * cie_xf.ssamp[i] +
 					y * cie_yf.ssamp[i] +
-					z * cie_zf.ssamp[i] ;
+					z * cie_zf.ssamp[i] + .5;
 		clr->flags |= C_CSSPEC;
 	}
 	if (fl & C_CSEFF) {		/* compute efficacy */
@@ -492,25 +502,47 @@ int	fl;
 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)
@@ -521,27 +553,25 @@ 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)
-				clr->ssamp[i] = scale*va[pos];
+			if (wl+FTINY >= wl0 & wl-FTINY <= wl0)
+				clr->ssamp[i] = scale*va[pos] + .5;
 			else		/* interpolate if necessary */
-				clr->ssamp[i] = scale / wlstep *
+				clr->ssamp[i] = .5 + scale / wlstep *
 						( va[pos]*(wl0+wlstep - wl) +
 							va[pos+1]*(wl - wl0) );
 			clr->ssum += clr->ssamp[i];
 		}
 	clr->flags = C_CDSPEC|C_CSSPEC;
 	clr->clock++;
-	free((MEM_PTR)va);
 	return(MG_OK);
 }
 
@@ -559,7 +589,7 @@ double	w1, w2;
 		c_ccvt(c1, C_CSSPEC|C_CSEFF);
 		c_ccvt(c2, C_CSSPEC|C_CSEFF);
 		w1 /= c1->eff*c1->ssum;
-		w2 /= c1->eff*c2->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];
@@ -580,3 +610,41 @@ double	w1, w2;
 		cres->flags = C_CDXY|C_CSXY;
 	}
 }
+
+
+#define	C1		3.741832e-16	/* W-m^2 */
+#define C2		1.4388e-2	/* m-K */
+
+#define bbsp(l,t)	(C1/((l)*(l)*(l)*(l)*(l)*(exp(C2/((t)*(l)))-1.)))
+#define bblm(t)		(C2/5./(t))
+
+static int
+setbbtemp(clr, tk)		/* set black body spectrum */
+register C_COLOR	*clr;
+double	tk;
+{
+	double	sf, wl;
+	register int	i;
+
+	if (tk < 1000)
+		return(MG_EILL);
+	wl = bblm(tk);			/* scalefactor based on peak */
+	if (wl < C_CMINWL*1e-9)
+		wl = C_CMINWL*1e-9;
+	else if (wl > C_CMAXWL*1e-9)
+		wl = C_CMAXWL*1e-9;
+	sf = C_CMAXV/bbsp(wl,tk);
+	clr->ssum = 0;
+	for (i = 0; i < C_CNSS; i++) {
+		wl = (C_CMINWL + i*C_CWLI)*1e-9;
+		clr->ssum += clr->ssamp[i] = sf*bbsp(wl,tk) + .5;
+	}
+	clr->flags = C_CDSPEC|C_CSSPEC;
+	clr->clock++;
+	return(MG_OK);
+}
+
+#undef	C1
+#undef	C2
+#undef	bbsp
+#undef	bblm