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.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))
# Line 36 | 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? */
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  
# Line 52 | Line 54 | typedef struct {
54          {"section",     3,      0,      NULL,   NULL}, \
55          {"OCTREE",      3,      0,      NULL,   onevalue}, \
56          {"RIF",         3,      0,      NULL,   onevalue}, \
55 –        {"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   }
# Line 65 | Line 67 | typedef struct {
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_DEL          3               /* delete from 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 */

Diff Legend

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