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.4 by gregl, Wed Nov 26 20:16:01 1997 UTC vs.
Revision 3.6 by gregl, Mon Dec 1 16:31:50 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))
# Line 42 | Line 44 | typedef struct {
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 */
47 > #define VDIST           10              /* virtual distance calculation */
48 > #define OCCUPANCY       11              /* expected occupancy probability */
49 > #define REPORT          12              /* report interval and error file */
50  
51 < #define NRHVARS         12              /* number of variables */
51 > #define NRHVARS         13              /* number of variables */
52  
53   #define RHVINIT { \
54          {"render",      3,      0,      NULL,   catvalues}, \
# Line 58 | Line 61 | typedef struct {
61          {"CACHE",       2,      0,      NULL,   fltvalue}, \
62          {"GRID",        2,      0,      NULL,   fltvalue}, \
63          {"OBSTRUCTIONS",3,      0,      NULL,   boolvalue}, \
64 +        {"VDISTANCE",   2,      0,      NULL,   boolvalue}, \
65          {"OCCUPANCY",   3,      0,      NULL,   onevalue}, \
66          {"REPORT",      3,      0,      NULL,   onevalue}, \
67   }
# Line 65 | Line 69 | typedef struct {
69                                  /* bundle set requests */
70   #define BS_NEW          1               /* replace current set with new one */
71   #define BS_ADD          2               /* add to current set */
72 < #define BS_DEL          3               /* delete from current set */
72 > #define BS_ADJ          3               /* adjust current set quantities */
73 > #define BS_DEL          4               /* delete from current set */
74  
75   extern char     *progname;      /* our program name */
76   extern char     *hdkfile;       /* holodeck file name */

Diff Legend

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