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.12 by gregl, Mon Dec 15 20:41:39 1997 UTC

# Line 38 | Line 38 | typedef struct {
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 */
41 > #define TIME            4               /* maximum rendering time */
42 > #define DISKSPACE       5               /* how much disk space to use */
43 > #define CACHE           6               /* amount of memory to use as cache */
44 > #define GRID            7               /* target grid size */
45 > #define OBSTRUCTIONS    8               /* shall we track obstructions? */
46 > #define VDIST           9               /* virtual distance calculation */
47 > #define REPORT          10              /* report interval and error file */
48  
49 < #define NRHVARS         12              /* number of variables */
49 > #define NRHVARS         11              /* number of variables */
50  
51   #define RHVINIT { \
52          {"render",      3,      0,      NULL,   catvalues}, \
53          {"section",     3,      0,      NULL,   NULL}, \
54          {"OCTREE",      3,      0,      NULL,   onevalue}, \
55          {"RIF",         3,      0,      NULL,   onevalue}, \
57        {"EXPOSURE",    3,      0,      NULL,   fltvalue}, \
56          {"TIME",        2,      0,      NULL,   fltvalue}, \
57          {"DISKSPACE",   3,      0,      NULL,   fltvalue}, \
58          {"CACHE",       2,      0,      NULL,   fltvalue}, \
59          {"GRID",        2,      0,      NULL,   fltvalue}, \
60          {"OBSTRUCTIONS",3,      0,      NULL,   boolvalue}, \
61 <        {"OCCUPANCY",   3,      0,      NULL,   onevalue}, \
61 >        {"VDISTANCE",   2,      0,      NULL,   boolvalue}, \
62          {"REPORT",      3,      0,      NULL,   onevalue}, \
63   }
64  
# Line 76 | Line 74 | extern char    froot[];        /* root file name */
74  
75   extern char     *outdev;        /* output device name */
76  
77 + extern int      readinp;        /* read input from stdin */
78 +
79 + extern int      force;          /* allow overwrite of holodeck */
80 +
81   extern int      nowarn;         /* turn warnings off? */
82  
83 < extern int      ncprocs;        /* number of compute processes */
83 > extern int      ncprocs;        /* number of requested compute processes */
84 > extern int      nprocs;         /* number of running compute processes */
85  
86   extern double   expval;         /* global exposure value */
87  
88   extern time_t   starttime;      /* time we got started */
89   extern time_t   endtime;        /* time we should end by */
90   extern time_t   reporttime;     /* time for next report */
91 +
92 + extern long     nraysdone;      /* number of rays done */
93 + extern long     npacksdone;     /* number of packets done */
94  
95   extern int      rtargc;         /* rtrace command */
96   extern char     *rtargv[];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines