ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/src/gen/mkillum2.c
(Generate patch)

Comparing src/gen/mkillum2.c (file contents):
Revision 2.12 by schorsch, Sun Nov 16 10:29:38 2003 UTC vs.
Revision 2.14 by schorsch, Sun Mar 28 20:33:12 2004 UTC

# Line 12 | Line 12 | static const char      RCSid[] = "$Id$";
12   #include  "cone.h"
13   #include  "random.h"
14  
15 < //void o_default(OBJREC *ob, struct illum_args *il, struct rtproc *rt, char *nm);
16 < void o_face(OBJREC *ob, struct illum_args *il, struct rtproc *rt, char *nm);
17 < void o_sphere(OBJREC *ob, struct illum_args *il, struct rtproc *rt, char *nm);
18 < void o_ring(OBJREC *ob, struct illum_args *il, struct rtproc *rt, char *nm);
15 >
16 > int o_default(FUN_ARGLIST);
17 > int o_face(FUN_ARGLIST);
18 > int o_sphere(FUN_ARGLIST);
19 > int o_ring(FUN_ARGLIST);
20   void raysamp(float res[3], FVECT org, FVECT dir, struct rtproc *rt);
21   void rayflush(struct rtproc *rt);
22   void mkaxes(FVECT u, FVECT v, FVECT n);
# Line 35 | Line 36 | o_default(     /* default illum action */
36                          nm, ofun[ob->otype].funame, ob->oname);
37          error(WARNING, errmsg);
38          printobj(il->altmat, ob);
39 +        return(1);
40   }
41  
42  
43 < void
43 > int
44   o_face(         /* make an illum face */
45          OBJREC  *ob,
46          struct illum_args  *il,
# Line 61 | Line 63 | o_face(                /* make an illum face */
63          fa = getface(ob);
64          if (fa->area == 0.0) {
65                  freeface(ob);
66 <                o_default(ob, il, rt, nm);
65 <                return;
66 >                return(o_default(ob, il, rt, nm));
67          }
68                                  /* set up sampling */
69          if (il->sampdens <= 0)
# Line 129 | Line 130 | o_face(                /* make an illum face */
130                          rt->nrays = 0;
131                          freeface(ob);
132                          free((void *)distarr);
133 <                        o_default(ob, il, rt, nm);
133 <                        return;
133 >                        return(o_default(ob, il, rt, nm));
134                      }
135                      for (j = 0; j < 3; j++)
136                          org[j] += .001*fa->norm[j];
# Line 149 | Line 149 | o_face(                /* make an illum face */
149          freeface(ob);
150          free((void *)distarr);
151   #undef MAXMISS
152 +        /* XXX we need to return something here. what is it? */
153   }
154  
155  
156 < void
156 > int
157   o_sphere(       /* make an illum sphere */
158          register OBJREC  *ob,
159          struct illum_args  *il,
# Line 220 | Line 221 | o_sphere(      /* make an illum sphere */
221                  printobj(il->altmat, ob);
222                                  /* clean up */
223          free((void *)distarr);
224 +        return(1);
225   }
226  
227  
228 < void
228 > int
229   o_ring(         /* make an illum ring */
230          OBJREC  *ob,
231          struct illum_args  *il,
# Line 291 | Line 293 | o_ring(                /* make an illum ring */
293                                  /* clean up */
294          freecone(ob);
295          free((void *)distarr);
296 +        return(1);
297   }
298  
299  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines