ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/cv/mgflib/context.c

Comparing ray/src/cv/mgflib/context.c (file contents):
Revision 1.9 by greg, Sat Jun 25 16:33:14 1994 UTC vs.
Revision 1.13 by greg, Fri Jul 1 18:06:56 1994 UTC

#	Line 26 | Line 26 | static C_VERTEX                c_unvertex = C_DEFVERTEX;
26
27		/* the current contexts */
28		C_COLOR         *c_ccolor = &c_uncolor;
29	+	char            *c_ccname = NULL;
30		C_MATERIAL      *c_cmaterial = &c_unmaterial;
31	+	char            *c_cmname = NULL;
32		C_VERTEX        *c_cvertex = &c_unvertex;
33	+	char            *c_cvname = NULL;
34
35		static LUTAB    clr_tab = LU_SINIT(free,free);  /* color lookup table */
36		static LUTAB    mat_tab = LU_SINIT(free,free);  /* material lookup table */
#	Line 58 | Line 61 | register char  **av;
61		if (ac == 1) {          /* set unnamed color context */
62		c_uncolor = c_dfcolor;
63		c_ccolor = &c_uncolor;
64	+	c_ccname = NULL;
65		return(MG_OK);
66		}
67		lp = lu_find(&clr_tab, av[1]);  /* lookup context */
#	Line 82 | Line 86 | register char  **av;
86		c_ccolor = (C_COLOR *)lp->data;
87		c_ccolor->clock = 0;
88		}
89	+	c_ccname = lp->key;
90	+	i = c_ccolor->clock;
91		if (ac == 3) {          /* use default template */
86	–	i = c_ccolor->clock;
92		*c_ccolor = c_dfcolor;
88	–	c_ccolor->name = av[1];
93		c_ccolor->clock = i + 1;
94		return(MG_OK);
95		}
#	Line 94 | Line 98 | register char  **av;
98		return(MG_EMEM);
99		if (lp->data == NULL)
100		return(MG_EUNDEF);
97	–	i = c_ccolor->clock;
101		*c_ccolor = *(C_COLOR *)lp->data;
99	–	c_ccolor->name = av[1];
102		c_ccolor->clock = i + 1;
103		return(MG_OK);
104		case MG_E_CXY:          /* assign CIE XY value */
#	Line 146 | Line 148 | register char  **av;
148		w, (C_COLOR *)lp->data);
149		wsum += w;
150		}
151	+	c_ccolor->clock++;
152		return(MG_OK);
153		}
154		return(MG_EUNK);
#	Line 167 | Line 170 | register char  **av;
170		if (ac == 1) {          /* set unnamed material context */
171		c_unmaterial = c_dfmaterial;
172		c_cmaterial = &c_unmaterial;
173	+	c_cmname = NULL;
174		return(MG_OK);
175		}
176		lp = lu_find(&mat_tab, av[1]);  /* lookup context */
#	Line 191 | Line 195 | register char  **av;
195		c_cmaterial = (C_MATERIAL *)lp->data;
196		c_cmaterial->clock = 0;
197		}
198	+	c_cmname = lp->key;
199	+	i = c_cmaterial->clock;
200		if (ac == 3) {          /* use default template */
195	–	i = c_cmaterial->clock;
201		*c_cmaterial = c_dfmaterial;
197	–	c_cmaterial->name = av[1];
202		c_cmaterial->clock = i + 1;
203		return(MG_OK);
204		}
#	Line 203 | Line 207 | register char  **av;
207		return(MG_EMEM);
208		if (lp->data == NULL)
209		return(MG_EUNDEF);
206	–	i = c_cmaterial->clock;
210		*c_cmaterial = *(C_MATERIAL *)lp->data;
208	–	c_cmaterial->name = av[1];
211		c_cmaterial->clock = i + 1;
212		return(MG_OK);
213		case MG_E_RD:           /* set diffuse reflectance */
#	Line 267 | Line 269 | register char  **av;
269		c_cmaterial->ts_c = *c_ccolor;
270		c_cmaterial->clock++;
271		return(MG_OK);
272	+	case MG_E_SIDES:        /* set number of sides */
273	+	if (ac != 2)
274	+	return(MG_EARGC);
275	+	if (!isint(av[1]))
276	+	return(MG_ETYPE);
277	+	i = atoi(av[1]);
278	+	if (i == 1)
279	+	c_cmaterial->sided = 1;
280	+	else if (i == 2)
281	+	c_cmaterial->sided = 0;
282	+	else
283	+	return(MG_EILL);
284	+	c_cmaterial->clock++;
285	+	return(MG_OK);
286		}
287		return(MG_EUNK);
288		}
#	Line 287 | Line 303 | register char  **av;
303		if (ac == 1) {          /* set unnamed vertex context */
304		c_unvertex = c_dfvertex;
305		c_cvertex = &c_unvertex;
306	+	c_cvname = NULL;
307		return(MG_OK);
308		}
309		lp = lu_find(&vtx_tab, av[1]);  /* lookup context */
#	Line 310 | Line 327 | register char  **av;
327		return(MG_EMEM);
328		c_cvertex = (C_VERTEX *)lp->data;
329		}
330	+	c_cvname = lp->key;
331	+	i = c_cvertex->clock;
332		if (ac == 3) {          /* use default template */
314	–	i = c_cvertex->clock;
333		*c_cvertex = c_dfvertex;
316	–	c_cvertex->name = av[1];
334		c_cvertex->clock = i + 1;
335		return(MG_OK);
336		}
#	Line 322 | Line 339 | register char  **av;
339		return(MG_EMEM);
340		if (lp->data == NULL)
341		return(MG_EUNDEF);
325	–	i = c_cvertex->clock;
342		*c_cvertex = *(C_VERTEX *)lp->data;
327	–	c_cvertex->name = av[1];
343		c_cvertex->clock = i + 1;
344		return(MG_OK);
345		case MG_E_POINT:        /* set point */
#	Line 368 | Line 383 | c_clearall()                   /* empty context tables */
383		}
384
385
386	+	C_MATERIAL *
387	+	c_getmaterial(name)             /* get a named material */
388	+	char    *name;
389	+	{
390	+	register LUENT  *lp;
391	+
392	+	if ((lp = lu_find(&mat_tab, name)) == NULL)
393	+	return(NULL);
394	+	return((C_MATERIAL *)lp->data);
395	+	}
396	+
397	+
398		C_VERTEX *
399		c_getvert(name)                 /* get a named vertex */
400		char    *name;
#	Line 533 | Line 560 | double w1, w2;
560		cres->cy = (w1 + w2) * scale;
561		cres->flags = C_CDXY|C_CSXY;
562		}
536	–	cres->clock++;                  /* record the change */
563		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)