--- ray/src/cv/mgflib/context.c	1994/06/24 16:28:15	1.5
+++ ray/src/cv/mgflib/context.c	1994/07/01 18:06:56	1.13
@@ -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,21 @@ 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_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,10 +83,14 @@ register char	**av;
 			lp->data = (char *)malloc(sizeof(C_COLOR));
 			if (lp->data == NULL)
 				return(MG_EMEM);
+			c_ccolor = (C_COLOR *)lp->data;
+			c_ccolor->clock = 0;
 		}
-		c_ccolor = (C_COLOR *)lp->data;
+		c_ccname = lp->key;
+		i = c_ccolor->clock;
 		if (ac == 3) {		/* use default template */
 			*c_ccolor = c_dfcolor;
+			c_ccolor->clock = i + 1;
 			return(MG_OK);
 		}
 		lp = lu_find(&clr_tab, av[3]);	/* lookup template */
@@ -91,8 +99,7 @@ register char	**av;
 		if (lp->data == NULL)
 			return(MG_EUNDEF);
 		*c_ccolor = *(C_COLOR *)lp->data;
-		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)
@@ -105,6 +112,7 @@ register char	**av;
 		if (c_ccolor->cx < 0. | c_ccolor->cy < 0. |
 				c_ccolor->cx + c_ccolor->cy > 1.)
 			return(MG_EILL);
+		c_ccolor->clock++;
 		return(MG_OK);
 	case MG_E_CSPEC:	/* assign spectral values */
 		if (ac < 5)
@@ -140,6 +148,7 @@ register char	**av;
 					w, (C_COLOR *)lp->data);
 			wsum += w;
 		}
+		c_ccolor->clock++;
 		return(MG_OK);
 	}
 	return(MG_EUNK);
@@ -151,6 +160,7 @@ c_hmaterial(ac, av)		/* handle material entity */
 int	ac;
 register char	**av;
 {
+	int	i;
 	register LUENT	*lp;
 
 	switch (mg_entity(av[0])) {
@@ -160,20 +170,21 @@ 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_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);
@@ -181,11 +192,14 @@ register char	**av;
 			lp->data = (char *)malloc(sizeof(C_MATERIAL));
 			if (lp->data == NULL)
 				return(MG_EMEM);
+			c_cmaterial = (C_MATERIAL *)lp->data;
+			c_cmaterial->clock = 0;
 		}
-		c_cmaterial = (C_MATERIAL *)lp->data;
+		c_cmname = lp->key;
+		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 */
@@ -194,10 +208,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)
@@ -230,6 +241,7 @@ register char	**av;
 		if (c_cmaterial->td < 0. | c_cmaterial->td > 1.)
 			return(MG_EILL);
 		c_cmaterial->td_c = *c_ccolor;
+		c_cmaterial->clock++;
 		return(MG_OK);
 	case MG_E_RS:		/* set specular reflectance */
 		if (ac != 3)
@@ -257,6 +269,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);
 }
@@ -267,6 +293,7 @@ c_hvertex(ac, av)		/* handle a vertex entity */
 int	ac;
 register char	**av;
 {
+	int	i;
 	register LUENT	*lp;
 
 	switch (mg_entity(av[0])) {
@@ -276,20 +303,21 @@ 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_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);
@@ -297,10 +325,13 @@ register char	**av;
 			lp->data = (char *)malloc(sizeof(C_VERTEX));
 			if (lp->data == NULL)
 				return(MG_EMEM);
+			c_cvertex = (C_VERTEX *)lp->data;
 		}
-		c_cvertex = (C_VERTEX *)lp->data;
+		c_cvname = lp->key;
+		i = c_cvertex->clock;
 		if (ac == 3) {		/* use default template */
 			*c_cvertex = c_dfvertex;
+			c_cvertex->clock = i + 1;
 			return(MG_OK);
 		}
 		lp = lu_find(&vtx_tab, av[3]);	/* lookup template */
@@ -309,8 +340,7 @@ register char	**av;
 		if (lp->data == NULL)
 			return(MG_EUNDEF);
 		*c_cvertex = *(C_VERTEX *)lp->data;
-		if (ac > 4)
-			return(MG_EARGC);
+		c_cvertex->clock = i + 1;
 		return(MG_OK);
 	case MG_E_POINT:	/* set point */
 		if (ac != 4)
@@ -320,6 +350,7 @@ register char	**av;
 		c_cvertex->p[0] = atof(av[1]);
 		c_cvertex->p[1] = atof(av[2]);
 		c_cvertex->p[2] = atof(av[3]);
+		c_cvertex->clock++;
 		return(MG_OK);
 	case MG_E_NORMAL:	/* set normal */
 		if (ac != 4)
@@ -330,6 +361,7 @@ register char	**av;
 		c_cvertex->n[1] = atof(av[2]);
 		c_cvertex->n[2] = atof(av[3]);
 		(void)normalize(c_cvertex->n);
+		c_cvertex->clock++;
 		return(MG_OK);
 	}
 	return(MG_EUNK);
@@ -351,6 +383,18 @@ c_clearall()			/* empty context tables */
 }
 
 
+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;
@@ -363,11 +407,23 @@ char	*name;
 }
 
 
+C_COLOR *
+c_getcolor(name)		/* get a named color */
+char	*name;
+{
+	register LUENT	*lp;
+
+	if ((lp = lu_find(&clr_tab, name)) == NULL)
+		return(NULL);
+	return((C_COLOR *)lp->data);
+}
+
+
 int
 c_isgrey(clr)			/* check if color is grey */
 register C_COLOR	*clr;
 {
-	if (!clr->flags)
+	if (!(clr->flags & (C_CSXY|C_CSSPEC)))
 		return(1);		/* no settings == grey */
 	c_ccvt(clr, C_CSXY);
 	return(clr->cx >= .323 && clr->cx <= .343 &&
@@ -385,7 +441,7 @@ int	fl;
 
 	if (clr->flags & fl)		/* already done */
 		return;
-	if (!(clr->flags & (C_SXY|C_SSPEC))	/* nothing set */
+	if (!(clr->flags & (C_CSXY|C_CSSPEC)))	/* nothing set! */
 		*clr = c_dfcolor;
 	else if (fl & C_CSXY) {		/* cspec -> cxy */
 		x = y = z = 0.;
@@ -465,6 +521,7 @@ char	**av;
 			clr->ssum += clr->ssamp[i];
 		}
 	clr->flags = C_CDSPEC|C_CSSPEC;
+	clr->clock++;
 	free((MEM_PTR)va);
 	return(MG_OK);
 }