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.8 by greg, Sat Jun 25 11:55:45 1994 UTC vs.
Revision 1.11 by greg, Thu Jun 30 11:07:36 1994 UTC

#	Line 49 | Line 49 | register char  **av;
49		{
50		double  w, wsum;
51		register int    i;
52	+	char    *nm;
53		register LUENT  *lp;
54
55		switch (mg_entity(av[0])) {
#	Line 63 | Line 64 | register char  **av;
64		lp = lu_find(&clr_tab, av[1]);  /* lookup context */
65		if (lp == NULL)
66		return(MG_EMEM);
67	+	c_ccolor = (C_COLOR *)lp->data;
68		if (ac == 2) {          /* reestablish previous context */
69	<	if (lp->data == NULL)
69	>	if (c_ccolor == NULL)
70		return(MG_EUNDEF);
69	–	c_ccolor = (C_COLOR *)lp->data;
71		return(MG_OK);
72		}
73		if (av[2][0] != '=' || av[2][1])
74		return(MG_ETYPE);
75	<	if (lp->key == NULL) {  /* create new color context */
75	>	if (c_ccolor == NULL) { /* create new color context */
76		lp->key = (char *)malloc(strlen(av[1])+1);
77		if (lp->key == NULL)
78		return(MG_EMEM);
#	Line 79 | Line 80 | register char  **av;
80		lp->data = (char *)malloc(sizeof(C_COLOR));
81		if (lp->data == NULL)
82		return(MG_EMEM);
83	+	c_ccolor = (C_COLOR *)lp->data;
84	+	c_ccolor->clock = 0;
85		}
86	<	c_ccolor = (C_COLOR *)lp->data;
86	>	nm = lp->key;
87	>	i = c_ccolor->clock;
88		if (ac == 3) {          /* use default template */
89		*c_ccolor = c_dfcolor;
90	<	c_ccolor->name = lp->key;
90	>	c_ccolor->name = nm;
91	>	c_ccolor->clock = i + 1;
92		return(MG_OK);
93		}
94		lp = lu_find(&clr_tab, av[3]);  /* lookup template */
#	Line 92 | Line 97 | register char  **av;
97		if (lp->data == NULL)
98		return(MG_EUNDEF);
99		*c_ccolor = *(C_COLOR *)lp->data;
100	<	c_ccolor->name = lp->key;
101	<	c_ccolor->clock = 1;
97	<	if (ac > 4)
98	<	return(MG_EARGC);
100	>	c_ccolor->name = nm;
101	>	c_ccolor->clock = i + 1;
102		return(MG_OK);
103		case MG_E_CXY:          /* assign CIE XY value */
104		if (ac != 3)
#	Line 144 | Line 147 | register char  **av;
147		w, (C_COLOR *)lp->data);
148		wsum += w;
149		}
150	+	c_ccolor->clock++;
151		return(MG_OK);
152		}
153		return(MG_EUNK);
#	Line 155 | Line 159 | c_hmaterial(ac, av)            /* handle material entity */
159		int     ac;
160		register char   **av;
161		{
162	+	int     i;
163	+	char    *nm;
164		register LUENT  *lp;
165
166		switch (mg_entity(av[0])) {
#	Line 169 | Line 175 | register char  **av;
175		lp = lu_find(&mat_tab, av[1]);  /* lookup context */
176		if (lp == NULL)
177		return(MG_EMEM);
178	+	c_cmaterial = (C_MATERIAL *)lp->data;
179		if (ac == 2) {          /* reestablish previous context */
180	<	if (lp->data == NULL)
180	>	if (c_cmaterial == NULL)
181		return(MG_EUNDEF);
175	–	c_cmaterial = (C_MATERIAL *)lp->data;
182		return(MG_OK);
183		}
184		if (av[2][0] != '=' || av[2][1])
185		return(MG_ETYPE);
186	<	if (lp->key == NULL) {  /* create new material context */
186	>	if (c_cmaterial == NULL) {      /* create new material */
187		lp->key = (char *)malloc(strlen(av[1])+1);
188		if (lp->key == NULL)
189		return(MG_EMEM);
#	Line 185 | Line 191 | register char  **av;
191		lp->data = (char *)malloc(sizeof(C_MATERIAL));
192		if (lp->data == NULL)
193		return(MG_EMEM);
194	+	c_cmaterial = (C_MATERIAL *)lp->data;
195	+	c_cmaterial->clock = 0;
196		}
197	<	c_cmaterial = (C_MATERIAL *)lp->data;
197	>	nm = lp->key;
198	>	i = c_cmaterial->clock;
199		if (ac == 3) {          /* use default template */
200		*c_cmaterial = c_dfmaterial;
201	<	c_cmaterial->name = lp->key;
201	>	c_cmaterial->name = nm;
202	>	c_cmaterial->clock = i + 1;
203		return(MG_OK);
204		}
205		lp = lu_find(&mat_tab, av[3]);  /* lookup template */
#	Line 198 | Line 208 | register char  **av;
208		if (lp->data == NULL)
209		return(MG_EUNDEF);
210		*c_cmaterial = *(C_MATERIAL *)lp->data;
211	<	c_cmaterial->name = lp->key;
212	<	c_cmaterial->clock = 1;
203	<	if (ac > 4)
204	<	return(MG_EARGC);
211	>	c_cmaterial->name = nm;
212	>	c_cmaterial->clock = i + 1;
213		return(MG_OK);
214		case MG_E_RD:           /* set diffuse reflectance */
215		if (ac != 2)
#	Line 272 | Line 280 | c_hvertex(ac, av)              /* handle a vertex entity */
280		int     ac;
281		register char   **av;
282		{
283	+	int     i;
284	+	char    *nm;
285		register LUENT  *lp;
286
287		switch (mg_entity(av[0])) {
#	Line 286 | Line 296 | register char  **av;
296		lp = lu_find(&vtx_tab, av[1]);  /* lookup context */
297		if (lp == NULL)
298		return(MG_EMEM);
299	+	c_cvertex = (C_VERTEX *)lp->data;
300		if (ac == 2) {          /* reestablish previous context */
301	<	if (lp->data == NULL)
301	>	if (c_cvertex == NULL)
302		return(MG_EUNDEF);
292	–	c_cvertex = (C_VERTEX *)lp->data;
303		return(MG_OK);
304		}
305		if (av[2][0] != '=' || av[2][1])
306		return(MG_ETYPE);
307	<	if (lp->key == NULL) {  /* create new vertex context */
307	>	if (c_cvertex == NULL) {        /* create new vertex context */
308		lp->key = (char *)malloc(strlen(av[1])+1);
309		if (lp->key == NULL)
310		return(MG_EMEM);
#	Line 302 | Line 312 | register char  **av;
312		lp->data = (char *)malloc(sizeof(C_VERTEX));
313		if (lp->data == NULL)
314		return(MG_EMEM);
315	+	c_cvertex = (C_VERTEX *)lp->data;
316		}
317	<	c_cvertex = (C_VERTEX *)lp->data;
317	>	nm = lp->key;
318	>	i = c_cvertex->clock;
319		if (ac == 3) {          /* use default template */
320		*c_cvertex = c_dfvertex;
321	<	c_cvertex->name = lp->key
321	>	c_cvertex->name = nm;
322	>	c_cvertex->clock = i + 1;
323		return(MG_OK);
324		}
325		lp = lu_find(&vtx_tab, av[3]);  /* lookup template */
#	Line 315 | Line 328 | register char  **av;
328		if (lp->data == NULL)
329		return(MG_EUNDEF);
330		*c_cvertex = *(C_VERTEX *)lp->data;
331	<	c_cvertex->name = lp->key
332	<	c_cvertex->clock = 1;
320	<	if (ac > 4)
321	<	return(MG_EARGC);
331	>	c_cvertex->name = nm;
332	>	c_cvertex->clock = i + 1;
333		return(MG_OK);
334		case MG_E_POINT:        /* set point */
335		if (ac != 4)
#	Line 361 | Line 372 | c_clearall()                   /* empty context tables */
372		}
373
374
375	+	C_MATERIAL *
376	+	c_getmaterial(name)             /* get a named material */
377	+	char    *name;
378	+	{
379	+	register LUENT  *lp;
380	+
381	+	if ((lp = lu_find(&mat_tab, name)) == NULL)
382	+	return(NULL);
383	+	return((C_MATERIAL *)lp->data);
384	+	}
385	+
386	+
387		C_VERTEX *
388		c_getvert(name)                 /* get a named vertex */
389		char    *name;
#	Line 526 | Line 549 | double w1, w2;
549		cres->cy = (w1 + w2) * scale;
550		cres->flags = C_CDXY|C_CSXY;
551		}
529	–	cres->clock++;                  /* record the change */
552		}

Diff Legend

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