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.2 by gregl, Mon Nov 3 18:33:12 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 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 <        RAYVAL  ra[RPACKSIZ];   /* ray values (fourth) */
20 >        int4    nc;             /* number calculated (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 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))
34 < #define packray(p)      (RAYVAL *)((PACKHEAD *)(p)+1)
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 VIEW            1               /* starting view */
44 < #define SECTION         2               /* holodeck section boundaries */
45 < #define OCTREE          3               /* octree file name */
46 < #define RIF             4               /* rad input file */
47 < #define EXPOSURE        5               /* section exposure value */
48 < #define TIME            6               /* maximum rendering time */
49 < #define DISKSPACE       7               /* how much disk space to use */
50 < #define CACHE           8               /* amount of memory to use as cache */
51 < #define GRID            9               /* target grid size */
52 < #define OBSTRUCTIONS    10              /* shall we track obstructions? */
53 < #define OCCUPANCY       11              /* expected occupancy probability */
47 < #define REPORT          12              /* 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         13              /* number of variables */
55 > #define NRHVARS         12              /* number of variables */
56  
57   #define RHVINIT { \
52        {"render",      3,      0,      NULL,   catvalues}, \
53        {"view",        2,      0,      NULL,   NULL}, \
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}, \
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 <        {"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 */
73 < #define BS_NEW          0               /* replace current set with new one */
74 < #define BS_ADD          1               /* add to current set */
75 < #define BS_DEL          2               /* delete from current set */
73 > #define BS_NEW          1               /* replace current set with new one */
74 > #define BS_ADD          2               /* add to current set */
75 > #define BS_ADJ          3               /* adjust current set quantities */
76 > #define BS_DEL          4               /* delete from current set */
77  
78   extern char     *progname;      /* our program name */
79   extern char     *hdkfile;       /* holodeck file name */
80   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 requested compute processes */
91 + extern int      nprocs;         /* number of running compute processes */
92 +
93   extern double   expval;         /* global exposure value */
94  
95 < extern int      ncprocs;        /* number of compute processes */
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