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

Comparing ray/src/hd/rholo.h (file contents):
Revision 3.5 by gregl, Wed Nov 26 21:34:27 1997 UTC vs.
Revision 3.15 by gwlarson, Wed Aug 26 12:42:27 1998 UTC

# Line 18 | Line 18 | typedef struct packet {
18          int4    bi;             /* beam index (second) */
19          int4    nr;             /* number of rays (third) */
20          int4    nc;             /* number calculated (fourth) */
21 <        RAYVAL  ra[RPACKSIZ];   /* ray values (fourth) */
21 >        RAYVAL  ra[RPACKSIZ];   /* ray values (fifth) */
22          float   *offset;        /* offset array if !vbool(OBSTRUCTIONS) */
23          struct packet   *next;  /* next in packet list */
24   } PACKET;               /* a beam packet */
# Line 34 | Line 34 | typedef struct {
34   #define packra(p)       ((RAYVAL *)((p)+1))
35  
36                                  /* input variables */
37 < #define RENDER          0               /* rendering options */
38 < #define SECTION         1               /* holodeck section boundaries */
39 < #define OCTREE          2               /* octree file name */
40 < #define RIF             3               /* rad input file */
41 < #define EXPOSURE        4               /* section exposure value */
42 < #define TIME            5               /* maximum rendering time */
43 < #define DISKSPACE       6               /* how much disk space to use */
44 < #define CACHE           7               /* amount of memory to use as cache */
45 < #define GRID            8               /* target grid size */
46 < #define OBSTRUCTIONS    9               /* shall we track obstructions? */
47 < #define OCCUPANCY       10              /* expected occupancy probability */
48 < #define REPORT          11              /* report interval and error file */
37 > #define CACHE           0               /* amount of memory to use as cache */
38 > #define DISKSPACE       1               /* how much disk space to use */
39 > #define EYESEP          2               /* eye separation distance */
40 > #define GRID            3               /* target grid size */
41 > #define OBSTRUCTIONS    4               /* shall we track obstructions? */
42 > #define OCTREE          5               /* octree file name */
43 > #define RENDER          6               /* rendering options */
44 > #define REPORT          7               /* report interval and error file */
45 > #define RIF             8               /* rad input file */
46 > #define SECTION         9               /* holodeck section boundaries */
47 > #define TIME            10              /* maximum rendering time */
48 > #define VDIST           11              /* virtual distance calculation */
49  
50   #define NRHVARS         12              /* number of variables */
51  
52   #define RHVINIT { \
53 –        {"render",      3,      0,      NULL,   catvalues}, \
54 –        {"section",     3,      0,      NULL,   NULL}, \
55 –        {"OCTREE",      3,      0,      NULL,   onevalue}, \
56 –        {"RIF",         3,      0,      NULL,   onevalue}, \
57 –        {"EXPOSURE",    3,      0,      NULL,   fltvalue}, \
58 –        {"TIME",        2,      0,      NULL,   fltvalue}, \
59 –        {"DISKSPACE",   3,      0,      NULL,   fltvalue}, \
53          {"CACHE",       2,      0,      NULL,   fltvalue}, \
54 +        {"DISKSPACE",   3,      0,      NULL,   fltvalue}, \
55 +        {"EYESEP",      3,      0,      NULL,   fltvalue}, \
56          {"GRID",        2,      0,      NULL,   fltvalue}, \
57          {"OBSTRUCTIONS",3,      0,      NULL,   boolvalue}, \
58 <        {"OCCUPANCY",   3,      0,      NULL,   onevalue}, \
58 >        {"OCTREE",      3,      0,      NULL,   onevalue}, \
59 >        {"render",      3,      0,      NULL,   catvalues}, \
60          {"REPORT",      3,      0,      NULL,   onevalue}, \
61 +        {"RIF",         3,      0,      NULL,   onevalue}, \
62 +        {"section",     3,      0,      NULL,   NULL}, \
63 +        {"TIME",        2,      0,      NULL,   fltvalue}, \
64 +        {"VDISTANCE",   2,      0,      NULL,   boolvalue}, \
65   }
66  
67                                  /* bundle set requests */
# Line 76 | Line 76 | extern char    froot[];        /* root file name */
76  
77   extern char     *outdev;        /* output device name */
78  
79 + extern int      readinp;        /* read input from stdin */
80 +
81 + extern int      force;          /* allow overwrite of holodeck */
82 +
83   extern int      nowarn;         /* turn warnings off? */
84  
85 < extern int      ncprocs;        /* number of compute processes */
85 > extern int      ncprocs;        /* number of requested compute processes */
86 > extern int      nprocs;         /* number of running compute processes */
87  
88   extern double   expval;         /* global exposure value */
89  
90   extern time_t   starttime;      /* time we got started */
91   extern time_t   endtime;        /* time we should end by */
92   extern time_t   reporttime;     /* time for next report */
93 +
94 + extern long     nraysdone;      /* number of rays done */
95 + extern long     npacksdone;     /* number of packets done */
96  
97   extern int      rtargc;         /* rtrace command */
98   extern char     *rtargv[];

Diff Legend

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