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.17 by gwlarson, Fri Dec 18 11:56:10 1998 UTC vs.
Revision 3.21 by greg, Sat Feb 22 02:07:25 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines