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.7 by gregl, Tue Dec 2 12:29:18 1997 UTC vs.
Revision 3.16 by gwlarson, Tue Nov 24 17:05:36 1998 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 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 GRID            3               /* target grid size */
46 > #define OBSTRUCTIONS    4               /* shall we track obstructions? */
47 > #define OCTREE          5               /* octree file name */
48 > #define RENDER          6               /* rendering options */
49 > #define REPORT          7               /* report interval and error file */
50 > #define RIF             8               /* rad input file */
51 > #define SECTION         9               /* holodeck section boundaries */
52 > #define TIME            10              /* maximum rendering time */
53 > #define VDIST           11              /* virtual distance calculation */
54  
55   #define NRHVARS         12              /* number of variables */
56  
57   #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 –        {"TIME",        2,      0,      NULL,   fltvalue}, \
58 –        {"DISKSPACE",   3,      0,      NULL,   fltvalue}, \
58          {"CACHE",       2,      0,      NULL,   fltvalue}, \
59 +        {"DISKSPACE",   3,      0,      NULL,   fltvalue}, \
60 +        {"EYESEP",      3,      0,      NULL,   fltvalue}, \
61          {"GRID",        2,      0,      NULL,   fltvalue}, \
62          {"OBSTRUCTIONS",3,      0,      NULL,   boolvalue}, \
63 <        {"VDISTANCE",   2,      0,      NULL,   boolvalue}, \
64 <        {"OCCUPANCY",   3,      0,      NULL,   onevalue}, \
63 >        {"OCTREE",      3,      0,      NULL,   onevalue}, \
64 >        {"render",      3,      0,      NULL,   catvalues}, \
65          {"REPORT",      3,      0,      NULL,   onevalue}, \
66 +        {"RIF",         3,      0,      NULL,   onevalue}, \
67 +        {"section",     3,      0,      NULL,   NULL}, \
68 +        {"TIME",        2,      0,      NULL,   fltvalue}, \
69 +        {"VDISTANCE",   2,      0,      NULL,   boolvalue}, \
70   }
71  
72                                  /* bundle set requests */
# Line 76 | Line 81 | extern char    froot[];        /* root file name */
81  
82   extern char     *outdev;        /* output device name */
83  
84 + extern int      readinp;        /* read input from stdin */
85 +
86 + extern int      force;          /* allow overwrite of holodeck */
87 +
88   extern int      nowarn;         /* turn warnings off? */
89  
90 < extern int      ncprocs;        /* number of compute processes */
90 > extern int      ncprocs;        /* number of requested compute processes */
91 > extern int      nprocs;         /* number of running compute processes */
92  
93   extern double   expval;         /* global exposure value */
94  
95 + extern VIEWPOINT        myeye;  /* target view position */
96 +
97   extern time_t   starttime;      /* time we got started */
98   extern time_t   endtime;        /* time we should end by */
99   extern time_t   reporttime;     /* time for next report */
100 +
101 + extern long     nraysdone;      /* number of rays done */
102 + extern long     npacksdone;     /* number of packets done */
103  
104   extern int      rtargc;         /* rtrace command */
105   extern char     *rtargv[];

Diff Legend

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