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.1 by gregl, Fri Oct 31 10:23:29 1997 UTC vs.
Revision 3.7 by gregl, Tue Dec 2 12:29:18 1997 UTC

# Line 17 | Line 17 | typedef struct packet {
17          int2    hd;             /* holodeck section (first) */
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) */
22          float   *offset;        /* offset array if !vbool(OBSTRUCTIONS) */
23          struct packet   *next;  /* next in packet list */
# Line 26 | Line 27 | typedef struct {
27          int2    hd;             /* holodeck section (first) */
28          int4    bi;             /* beam index (second) */
29          int4    nr;             /* number of rays (third) */
30 +        int4    nc;             /* number calculated (fourth) */
31   } PACKHEAD;             /* followed by ray values */
32  
33   #define packsiz(nr)     (sizeof(PACKHEAD)+(nr)*sizeof(RAYVAL))
34 < #define packray(p)      (RAYVAL *)((PACKHEAD *)(p)+1)
34 > #define packra(p)       ((RAYVAL *)((p)+1))
35  
36                                  /* input variables */
37   #define RENDER          0               /* rendering options */
38 < #define VIEW            1               /* starting view */
39 < #define SECTION         2               /* holodeck section boundaries */
40 < #define OCTREE          3               /* octree file name */
41 < #define RIF             4               /* rad input file */
42 < #define EXPOSURE        5               /* section exposure value */
43 < #define TIME            6               /* maximum rendering time */
44 < #define DISKSPACE       7               /* how much disk space to use */
45 < #define CACHE           8               /* amount of memory to use as cache */
46 < #define GRID            9               /* target grid size */
47 < #define OBSTRUCTIONS    10              /* shall we track obstructions? */
48 < #define OCCUPANCY       11              /* expected occupancy probability */
47 < #define REPORT          12              /* report interval and error file */
38 > #define SECTION         1               /* holodeck section boundaries */
39 > #define OCTREE          2               /* octree file name */
40 > #define RIF             3               /* rad input 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 OCCUPANCY       10              /* expected occupancy probability */
48 > #define REPORT          11              /* report interval and error file */
49  
50 < #define NRHVARS         13              /* number of variables */
50 > #define NRHVARS         12              /* number of variables */
51  
52   #define RHVINIT { \
53          {"render",      3,      0,      NULL,   catvalues}, \
53        {"view",        2,      0,      NULL,   NULL}, \
54          {"section",     3,      0,      NULL,   NULL}, \
55          {"OCTREE",      3,      0,      NULL,   onevalue}, \
56          {"RIF",         3,      0,      NULL,   onevalue}, \
57        {"EXPOSURE",    3,      0,      NULL,   fltvalue}, \
57          {"TIME",        2,      0,      NULL,   fltvalue}, \
58          {"DISKSPACE",   3,      0,      NULL,   fltvalue}, \
59          {"CACHE",       2,      0,      NULL,   fltvalue}, \
60          {"GRID",        2,      0,      NULL,   fltvalue}, \
61          {"OBSTRUCTIONS",3,      0,      NULL,   boolvalue}, \
62 +        {"VDISTANCE",   2,      0,      NULL,   boolvalue}, \
63          {"OCCUPANCY",   3,      0,      NULL,   onevalue}, \
64          {"REPORT",      3,      0,      NULL,   onevalue}, \
65   }
66  
67 +                                /* bundle set requests */
68 + #define BS_NEW          1               /* replace current set with new one */
69 + #define BS_ADD          2               /* add to current set */
70 + #define BS_ADJ          3               /* adjust current set quantities */
71 + #define BS_DEL          4               /* delete from current set */
72 +
73   extern char     *progname;      /* our program name */
74   extern char     *hdkfile;       /* holodeck file name */
75   extern char     froot[];        /* root file name */
76  
77 + extern char     *outdev;        /* output device name */
78 +
79   extern int      nowarn;         /* turn warnings off? */
80  
73 extern double   expval;         /* global exposure value */
74
81   extern int      ncprocs;        /* number of compute processes */
82 +
83 + extern double   expval;         /* global exposure value */
84  
85   extern time_t   starttime;      /* time we got started */
86   extern time_t   endtime;        /* time we should end by */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines