ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/common/rglmat.c
(Generate patch)

Comparing ray/src/common/rglmat.c (file contents):
Revision 3.6 by schorsch, Fri Nov 14 17:22:06 2003 UTC vs.
Revision 3.7 by greg, Fri Feb 18 00:40:25 2011 UTC

# Line 11 | Line 11 | static const char      RCSid[] = "$Id$";
11  
12   int     domats = 1;                     /* are we doing materials? */
13  
14 + extern lut_free_t       freemtl;
15 +
16   LUTAB   mtab = LU_SINIT(free,freemtl);
17  
18  
19   void
20 < rgl_matclear()                  /* clean up materials */
20 > rgl_matclear(void)                      /* clean up materials */
21   {
22          lu_done(&mtab);
23          domats = 1;
# Line 23 | Line 25 | rgl_matclear()                 /* clean up materials */
25  
26  
27   MATREC *
28 < getmatp(nam)                    /* find material record for modifier name */
29 < char    *nam;
28 > getmatp(                        /* find material record for modifier name */
29 >        char    *nam
30 > )
31   {
32          register LUENT  *lup;
33  
# Line 37 | Line 40 | char   *nam;
40  
41  
42   int
43 < o_default(o)                    /* default object is non-material modifier */
44 < register OBJREC *o;
43 > o_default(                      /* default object is non-material modifier */
44 >        register OBJREC *o
45 > )
46   {
47          register LUENT  *lup;
48   #ifdef DEBUG
# Line 65 | Line 69 | memerr:
69  
70  
71   int
72 < o_unsupported(o)                /* unsupported object primitive */
73 < OBJREC  *o;
72 > o_unsupported(          /* unsupported object primitive */
73 >        OBJREC  *o
74 > )
75   {
76          objerror(o, WARNING, "unsupported type");
77          return(0);
# Line 74 | Line 79 | OBJREC *o;
79  
80  
81   MATREC *
82 < newmaterial(nam)                /* get an entry for a new material */
83 < char    *nam;
82 > newmaterial(            /* get an entry for a new material */
83 >        char    *nam
84 > )
85   {
86          register LUENT  *lup;
87                                          /* look it up (assign entry) */
# Line 100 | Line 106 | memerr:
106  
107  
108   void
109 < freemtl(p)                      /* free a material */
104 < void    *p;
109 > freemtl(void *p)                /* free a material */
110   {
111          register MATREC *mp = (MATREC *)p;
112  
# Line 111 | Line 116 | void   *p;
116  
117  
118   int
119 < m_normal(o)                     /* compute normal material parameters */
120 < register OBJREC *o;
119 > m_normal(                       /* compute normal material parameters */
120 >        register OBJREC *o
121 > )
122   {
123          register MATREC *m;
124                                          /* check arguments */
# Line 144 | Line 150 | register OBJREC        *o;
150  
151  
152   int
153 < m_aniso(o)                      /* anisotropic material */
154 < register OBJREC *o;
153 > m_aniso(                        /* anisotropic material */
154 >        register OBJREC *o
155 > )
156   {
157          register MATREC *m;
158                                          /* check arguments */
# Line 177 | Line 184 | register OBJREC        *o;
184  
185  
186   int
187 < m_glass(o)                      /* glass material (hopeless) */
188 < OBJREC  *o;
187 > m_glass(                        /* glass material (hopeless) */
188 >        OBJREC  *o
189 > )
190   {
191          register MATREC *m;
192  

Diff Legend

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