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.3 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 3.4 by greg, Wed Apr 23 02:28:06 2003 UTC

# Line 57 | Line 57 | register OBJREC        *o;
57                  freemtl((MATREC *)lup->data);
58          if ((lup->data = o->os) != NULL)        /* make material reference */
59                  ((MATREC *)lup->data)->nlinks++;
60 <        return;
60 >        return(0);
61   memerr:
62          error(SYSTEM, "out of memory in o_default");
63 +        return(0);
64   }
65  
66  
67 + int
68 + o_unsupported(o)                /* unsupported object primitive */
69 + OBJREC  *o;
70 + {
71 +        objerror(o, WARNING, "unsupported type");
72 +        return(0);
73 + }
74 +
75 +
76   MATREC *
77   newmaterial(nam)                /* get an entry for a new material */
78   char    *nam;
# Line 126 | Line 136 | register OBJREC        *o;
136                  m->u.m.specexp = 2./(o->oargs.farg[4]*o->oargs.farg[4]);
137          if (m->u.m.specexp > MAXSPECEXP)
138                  m->u.m.specexp = MAXSPECEXP;
139 +        return(0);
140   }
141  
142  
# Line 158 | Line 169 | register OBJREC        *o;
169                  m->u.m.specexp = 2./(o->oargs.farg[4]*o->oargs.farg[5]);
170          if (m->u.m.specexp > MAXSPECEXP)
171                  m->u.m.specexp = MAXSPECEXP;
172 +        return(0);
173   }
174  
175  
# Line 172 | Line 184 | OBJREC *o;
184          setcolor(m->u.m.ambdiff, 0., 0., 0.);
185          setcolor(m->u.m.specular, .08, .08, .08);
186          m->u.m.specexp = MAXSPECEXP;
187 +        return(0);
188   }
189  
190  
# Line 199 | Line 212 | register OBJREC        *o;
212                  scalecolor(m->u.m.ambdiff, 1.-o->oargs.farg[4]);
213          }
214          m->u.m.specexp = UNKSPECEXP;
215 +        return(0);
216   }
217  
218  
# Line 219 | Line 233 | register OBJREC        *o;
233                                          /* guess the rest */
234          setcolor(m->u.m.specular, .1, .1, .1);
235          m->u.m.specexp = UNKSPECEXP;
236 +        return(0);
237   }
238  
239  
# Line 248 | Line 263 | register OBJREC        *o;
263                  m->u.l.spotdir[0] = m->u.l.spotdir[1] = 0.;
264                  m->u.l.spotdir[2] = -1.;
265          }
266 +        return(0);
267   }
268  
269  
# Line 265 | Line 281 | register OBJREC        *o;
281          setcolor(m->u.m.specular, o->oargs.farg[0],
282                          o->oargs.farg[1], o->oargs.farg[2]);
283          m->u.m.specexp = MAXSPECEXP;
284 +        return(0);
285   }
286  
287  
# Line 279 | Line 296 | register OBJREC        *o;
296          setcolor(m->u.m.ambdiff, 0.2, 0.2, 0.2);
297          setcolor(m->u.m.specular, 0.1, 0.1, 0.1);
298          m->u.m.specexp = UNKSPECEXP;
299 +        return(0);
300   }

Diff Legend

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