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.16 by gwlarson, Tue Nov 24 17:05:36 1998 UTC vs.
Revision 3.20 by gwlarson, Thu Mar 4 10:29:23 1999 UTC

# Line 34 | Line 34 | typedef struct {
34   #define packra(p)       ((RAYVAL *)((p)+1))
35  
36   typedef struct {
37 +        int     nb;             /* number of beams in list */
38 +        PACKHEAD        *bl;    /* allocated beam list */
39 + } BEAMLIST;             /* a list of beam requests */
40 +
41 + typedef struct {
42          FVECT   vpt;            /* view (eye point) position */
43          double  rng;            /* desired mean radius for sample rays */
44   } VIEWPOINT;            /* target eye position */
# Line 42 | Line 47 | typedef struct {
47   #define CACHE           0               /* amount of memory to use as cache */
48   #define DISKSPACE       1               /* how much disk space to use */
49   #define EYESEP          2               /* eye separation distance */
50 < #define GRID            3               /* target grid size */
51 < #define OBSTRUCTIONS    4               /* shall we track obstructions? */
52 < #define OCTREE          5               /* octree file name */
53 < #define RENDER          6               /* rendering options */
54 < #define REPORT          7               /* report interval and error file */
55 < #define RIF             8               /* rad input file */
56 < #define SECTION         9               /* holodeck section boundaries */
57 < #define TIME            10              /* maximum rendering time */
58 < #define VDIST           11              /* virtual distance calculation */
50 > #define GEOMETRY        3               /* section geometry */
51 > #define GRID            4               /* target grid size */
52 > #define OBSTRUCTIONS    5               /* shall we track obstructions? */
53 > #define OCTREE          6               /* octree file name */
54 > #define PORTS           7               /* section portals */
55 > #define RENDER          8               /* rendering options */
56 > #define REPORT          9               /* report interval and error file */
57 > #define RIF             10              /* rad input file */
58 > #define SECTION         11              /* holodeck section boundaries */
59 > #define TIME            12              /* maximum rendering time */
60 > #define VDIST           13              /* virtual distance calculation */
61  
62 < #define NRHVARS         12              /* number of variables */
62 > #define NRHVARS         14              /* number of variables */
63  
64   #define RHVINIT { \
65          {"CACHE",       2,      0,      NULL,   fltvalue}, \
66          {"DISKSPACE",   3,      0,      NULL,   fltvalue}, \
67          {"EYESEP",      3,      0,      NULL,   fltvalue}, \
68 +        {"geometry",    3,      0,      NULL,   NULL}, \
69          {"GRID",        2,      0,      NULL,   fltvalue}, \
70          {"OBSTRUCTIONS",3,      0,      NULL,   boolvalue}, \
71          {"OCTREE",      3,      0,      NULL,   onevalue}, \
72 +        {"portals",     3,      0,      NULL,   NULL}, \
73          {"render",      3,      0,      NULL,   catvalues}, \
74          {"REPORT",      3,      0,      NULL,   onevalue}, \
75          {"RIF",         3,      0,      NULL,   onevalue}, \
# Line 74 | Line 83 | typedef struct {
83   #define BS_ADD          2               /* add to current set */
84   #define BS_ADJ          3               /* adjust current set quantities */
85   #define BS_DEL          4               /* delete from current set */
86 + #define BS_MAX          5               /* set to max of old and new */
87  
88   extern char     *progname;      /* our program name */
89   extern char     *hdkfile;       /* holodeck file name */
# Line 90 | Line 100 | extern int     nowarn;         /* turn warnings off? */
100   extern int      ncprocs;        /* number of requested compute processes */
101   extern int      nprocs;         /* number of running compute processes */
102  
103 < extern double   expval;         /* global exposure value */
103 > extern int      chunkycmp;      /* using "chunky" comparison mode */
104  
105   extern VIEWPOINT        myeye;  /* target view position */
106  
# Line 105 | Line 115 | extern int     rtargc;         /* rtrace command */
115   extern char     *rtargv[];
116  
117   extern PACKET   *do_packets(), *get_packets(), *flush_queue();
118 +
119 + extern int2     *viewbeams();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines