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

Comparing ray/src/gen/mkillum.h (file contents):
Revision 2.7 by greg, Fri Sep 17 21:43:50 2004 UTC vs.
Revision 2.9 by greg, Thu Sep 13 17:52:35 2007 UTC

# Line 5 | Line 5
5   #ifndef _RAD_MKILLUM_H_
6   #define _RAD_MKILLUM_H_
7  
8 < #include  "standard.h"
9 < #include  "object.h"
10 < #include  "rtprocess.h"
8 > #include  "ray.h"
9 > #include  "otypes.h"
10  
11   #ifdef __cplusplus
12   extern "C" {
# Line 27 | Line 26 | struct illum_args {
26          int     sampdens;               /* point sample density */
27          int     nsamps;                 /* # of samples in each direction */
28          float   minbrt;                 /* minimum average brightness */
29 <        float   col[3];                 /* computed average color */
29 >        COLOR   col;                    /* computed average color */
30   };                              /* illum options */
31  
32 < struct rtproc {
33 <        struct rtproc   *next;          /* next in list of processes */
34 <        SUBPROC pd;                     /* rtrace pipe descriptors */
35 <        float   *buf;                   /* rtrace i/o buffer */
36 <        int     bsiz;                   /* maximum rays for rtrace buffer */
37 <        float   **dest;                 /* destination for each ray result */
39 <        int     nrays;                  /* current length of rtrace buffer */
40 < };                              /* rtrace process */
32 > extern void printobj(char *mod, register OBJREC *obj);
33 > extern int average(register struct illum_args *il, COLORV *da, int n);
34 > extern void flatout(struct illum_args *il, COLORV *da, int n, int m,
35 >        FVECT u, FVECT v, FVECT w);
36 > extern void illumout(register struct illum_args *il, OBJREC *ob);
37 > extern void roundout(struct illum_args *il, COLORV *da, int n, int m);
38  
39 < extern void printobj(char  *mod, register OBJREC  *obj);
40 < extern int average(register struct illum_args  *il, float  *da, int  n);
41 < extern void flatout(struct illum_args  *il, float  *da, int  n, int  m,
42 <        FVECT  u, FVECT  v, FVECT  w);
46 < extern void illumout(register struct illum_args  *il, OBJREC  *ob);
47 < extern void roundout(struct illum_args  *il, float  *da, int  n, int  m);
39 > extern int my_default(OBJREC *, struct illum_args *, char *);
40 > extern int my_face(OBJREC *, struct illum_args *, char *);
41 > extern int my_sphere(OBJREC *, struct illum_args *, char *);
42 > extern int my_ring(OBJREC *, struct illum_args *, char *);
43  
44 < /* The header file otypes.h has to follow definition of our struct's */
50 < #define FUN_ARGLIST     OBJREC *, struct illum_args *, struct rtproc *, char *
51 < #ifdef __cplusplus
52 < }
53 < #include  "otypes.h"
54 < extern "C" {
55 < #else
56 < #include  "otypes.h"
57 < #endif
58 <
59 < extern int o_default(FUN_ARGLIST);
60 < extern int o_face(FUN_ARGLIST);
61 < extern int o_sphere(FUN_ARGLIST);
62 < extern int o_ring(FUN_ARGLIST);
63 < extern void raysamp(float res[3], FVECT org, FVECT dir, struct rtproc *rt0);
64 < extern void rayflush(struct rtproc *rt, int doall);
65 < extern struct rtproc *raywait(struct rtproc *rt0);
66 <
44 > extern char     *progname;
45  
46   #ifdef __cplusplus
47   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines