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.11 by greg, Thu Jun 30 11:07:36 1994 UTC vs.
Revision 1.12 by greg, Fri Jul 1 10:18:38 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 49 | Line 52 | register char  **av;
52		{
53		double  w, wsum;
54		register int    i;
52	–	char    *nm;
55		register LUENT  *lp;
56
57		switch (mg_entity(av[0])) {
#	Line 59 | 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 83 | Line 86 | register char  **av;
86		c_ccolor = (C_COLOR *)lp->data;
87		c_ccolor->clock = 0;
88		}
89	<	nm = lp->key;
89	>	c_ccname = lp->key;
90		i = c_ccolor->clock;
91		if (ac == 3) {          /* use default template */
92		*c_ccolor = c_dfcolor;
90	–	c_ccolor->name = nm;
93		c_ccolor->clock = i + 1;
94		return(MG_OK);
95		}
#	Line 97 | Line 99 | register char  **av;
99		if (lp->data == NULL)
100		return(MG_EUNDEF);
101		*c_ccolor = *(C_COLOR *)lp->data;
100	–	c_ccolor->name = nm;
102		c_ccolor->clock = i + 1;
103		return(MG_OK);
104		case MG_E_CXY:          /* assign CIE XY value */
#	Line 160 | Line 161 | int    ac;
161		register char   **av;
162		{
163		int     i;
163	–	char    *nm;
164		register LUENT  *lp;
165
166		switch (mg_entity(av[0])) {
#	Line 170 | 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 194 | Line 195 | register char  **av;
195		c_cmaterial = (C_MATERIAL *)lp->data;
196		c_cmaterial->clock = 0;
197		}
198	<	nm = lp->key;
198	>	c_cmname = lp->key;
199		i = c_cmaterial->clock;
200		if (ac == 3) {          /* use default template */
201		*c_cmaterial = c_dfmaterial;
201	–	c_cmaterial->name = nm;
202		c_cmaterial->clock = i + 1;
203		return(MG_OK);
204		}
#	Line 208 | 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 = nm;
211		c_cmaterial->clock = i + 1;
212		return(MG_OK);
213		case MG_E_RD:           /* set diffuse reflectance */
#	Line 281 | Line 280 | int    ac;
280		register char   **av;
281		{
282		int     i;
284	–	char    *nm;
283		register LUENT  *lp;
284
285		switch (mg_entity(av[0])) {
#	Line 291 | Line 289 | register char  **av;
289		if (ac == 1) {          /* set unnamed vertex context */
290		c_unvertex = c_dfvertex;
291		c_cvertex = &c_unvertex;
292	+	c_cvname = NULL;
293		return(MG_OK);
294		}
295		lp = lu_find(&vtx_tab, av[1]);  /* lookup context */
#	Line 314 | Line 313 | register char  **av;
313		return(MG_EMEM);
314		c_cvertex = (C_VERTEX *)lp->data;
315		}
316	<	nm = lp->key;
316	>	c_cvname = lp->key;
317		i = c_cvertex->clock;
318		if (ac == 3) {          /* use default template */
319		*c_cvertex = c_dfvertex;
321	–	c_cvertex->name = nm;
320		c_cvertex->clock = i + 1;
321		return(MG_OK);
322		}
#	Line 328 | Line 326 | register char  **av;
326		if (lp->data == NULL)
327		return(MG_EUNDEF);
328		*c_cvertex = *(C_VERTEX *)lp->data;
331	–	c_cvertex->name = nm;
329		c_cvertex->clock = i + 1;
330		return(MG_OK);
331		case MG_E_POINT:        /* set point */

Diff Legend

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