ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/src/hd/rholo.h
(Generate patch)

Comparing src/hd/rholo.h (file contents):
Revision 3.12 by gregl, Mon Dec 15 20:41:39 1997 UTC vs.
Revision 3.19 by gwlarson, Tue Feb 2 16:13:24 1999 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1997 Silicon Graphics, Inc. */
1 > /* Copyright (c) 1998 Silicon Graphics, Inc. */
2  
3   /* SCCSid "$SunId$ SGI" */
4  
# Line 18 | Line 18 | typedef struct packet {
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) */
21 >        RAYVAL  ra[RPACKSIZ];   /* ray values (fifth) */
22          float   *offset;        /* offset array if !vbool(OBSTRUCTIONS) */
23          struct packet   *next;  /* next in packet list */
24   } PACKET;               /* a beam packet */
# Line 33 | Line 33 | typedef struct {
33   #define packsiz(nr)     (sizeof(PACKHEAD)+(nr)*sizeof(RAYVAL))
34   #define packra(p)       ((RAYVAL *)((p)+1))
35  
36 + typedef struct {
37 +        FVECT   vpt;            /* view (eye point) position */
38 +        double  rng;            /* desired mean radius for sample rays */
39 + } VIEWPOINT;            /* target eye position */
40 +
41                                  /* input variables */
42 < #define RENDER          0               /* rendering options */
43 < #define SECTION         1               /* holodeck section boundaries */
44 < #define OCTREE          2               /* octree file name */
45 < #define RIF             3               /* rad input file */
46 < #define TIME            4               /* maximum rendering time */
47 < #define DISKSPACE       5               /* how much disk space to use */
48 < #define CACHE           6               /* amount of memory to use as cache */
49 < #define GRID            7               /* target grid size */
50 < #define OBSTRUCTIONS    8               /* shall we track obstructions? */
51 < #define VDIST           9               /* virtual distance calculation */
52 < #define REPORT          10              /* report interval and error file */
42 > #define CACHE           0               /* amount of memory to use as cache */
43 > #define DISKSPACE       1               /* how much disk space to use */
44 > #define EYESEP          2               /* eye separation distance */
45 > #define GEOMETRY        3               /* section geometry */
46 > #define GRID            4               /* target grid size */
47 > #define OBSTRUCTIONS    5               /* shall we track obstructions? */
48 > #define OCTREE          6               /* octree file name */
49 > #define PORTS           7               /* section portals */
50 > #define RENDER          8               /* rendering options */
51 > #define REPORT          9               /* report interval and error file */
52 > #define RIF             10              /* rad input file */
53 > #define SECTION         11              /* holodeck section boundaries */
54 > #define TIME            12              /* maximum rendering time */
55 > #define VDIST           13              /* virtual distance calculation */
56  
57 < #define NRHVARS         11              /* number of variables */
57 > #define NRHVARS         14              /* number of variables */
58  
59   #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}, \
56 –        {"TIME",        2,      0,      NULL,   fltvalue}, \
57 –        {"DISKSPACE",   3,      0,      NULL,   fltvalue}, \
60          {"CACHE",       2,      0,      NULL,   fltvalue}, \
61 +        {"DISKSPACE",   3,      0,      NULL,   fltvalue}, \
62 +        {"EYESEP",      3,      0,      NULL,   fltvalue}, \
63 +        {"geometry",    3,      0,      NULL,   NULL}, \
64          {"GRID",        2,      0,      NULL,   fltvalue}, \
65          {"OBSTRUCTIONS",3,      0,      NULL,   boolvalue}, \
66 <        {"VDISTANCE",   2,      0,      NULL,   boolvalue}, \
66 >        {"OCTREE",      3,      0,      NULL,   onevalue}, \
67 >        {"portals",     3,      0,      NULL,   NULL}, \
68 >        {"render",      3,      0,      NULL,   catvalues}, \
69          {"REPORT",      3,      0,      NULL,   onevalue}, \
70 +        {"RIF",         3,      0,      NULL,   onevalue}, \
71 +        {"section",     3,      0,      NULL,   NULL}, \
72 +        {"TIME",        2,      0,      NULL,   fltvalue}, \
73 +        {"VDISTANCE",   2,      0,      NULL,   boolvalue}, \
74   }
75  
76                                  /* bundle set requests */
# Line 83 | Line 94 | extern int     nowarn;         /* turn warnings off? */
94   extern int      ncprocs;        /* number of requested compute processes */
95   extern int      nprocs;         /* number of running compute processes */
96  
97 < extern double   expval;         /* global exposure value */
97 > extern int      chunkycmp;      /* using "chunky" comparison mode */
98 >
99 > extern VIEWPOINT        myeye;  /* target view position */
100  
101   extern time_t   starttime;      /* time we got started */
102   extern time_t   endtime;        /* time we should end by */

Diff Legend

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