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.5 by gregl, Wed Nov 26 21:34:27 1997 UTC vs.
Revision 3.18 by gwlarson, Sun Jan 31 10:56:57 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 EXPOSURE        4               /* section exposure value */
47 < #define TIME            5               /* maximum rendering time */
48 < #define DISKSPACE       6               /* how much disk space to use */
49 < #define CACHE           7               /* amount of memory to use as cache */
50 < #define GRID            8               /* target grid size */
51 < #define OBSTRUCTIONS    9               /* shall we track obstructions? */
52 < #define OCCUPANCY       10              /* expected occupancy probability */
53 < #define REPORT          11              /* 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         12              /* number of variables */
57 > #define NRHVARS         14              /* number of variables */
58  
59   #define RHVINIT { \
53        {"render",      3,      0,      NULL,   catvalues}, \
54        {"section",     3,      0,      NULL,   NULL}, \
55        {"OCTREE",      3,      0,      NULL,   onevalue}, \
56        {"RIF",         3,      0,      NULL,   onevalue}, \
57        {"EXPOSURE",    3,      0,      NULL,   fltvalue}, \
58        {"TIME",        2,      0,      NULL,   fltvalue}, \
59        {"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 <        {"OCCUPANCY",   3,      0,      NULL,   onevalue}, \
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 76 | Line 85 | extern char    froot[];        /* root file name */
85  
86   extern char     *outdev;        /* output device name */
87  
88 + extern int      readinp;        /* read input from stdin */
89 +
90 + extern int      force;          /* allow overwrite of holodeck */
91 +
92   extern int      nowarn;         /* turn warnings off? */
93  
94 < extern int      ncprocs;        /* number of compute processes */
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 */
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 */
103   extern time_t   reporttime;     /* time for next report */
104 +
105 + extern long     nraysdone;      /* number of rays done */
106 + extern long     npacksdone;     /* number of packets done */
107  
108   extern int      rtargc;         /* rtrace command */
109   extern char     *rtargv[];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines