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

Comparing ray/src/hd/rholo.h (file contents):
Revision 3.19 by gwlarson, Tue Feb 2 16:13:24 1999 UTC vs.
Revision 3.22 by greg, Fri Jun 20 00:25:49 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 14 | Line 11
11   #endif
12  
13   typedef struct packet {
14 <        int2    hd;             /* holodeck section (first) */
15 <        int4    bi;             /* beam index (second) */
16 <        int4    nr;             /* number of rays (third) */
17 <        int4    nc;             /* number calculated (fourth) */
14 >        int16   hd;             /* holodeck section (first) */
15 >        int32   bi;             /* beam index (second) */
16 >        int32   nr;             /* number of rays (third) */
17 >        int32   nc;             /* number calculated (fourth) */
18          RAYVAL  ra[RPACKSIZ];   /* ray values (fifth) */
19          float   *offset;        /* offset array if !vbool(OBSTRUCTIONS) */
20          struct packet   *next;  /* next in packet list */
21   } PACKET;               /* a beam packet */
22  
23   typedef struct {
24 <        int2    hd;             /* holodeck section (first) */
25 <        int4    bi;             /* beam index (second) */
26 <        int4    nr;             /* number of rays (third) */
27 <        int4    nc;             /* number calculated (fourth) */
24 >        int16   hd;             /* holodeck section (first) */
25 >        int32   bi;             /* beam index (second) */
26 >        int32   nr;             /* number of rays (third) */
27 >        int32   nc;             /* number calculated (fourth) */
28   } PACKHEAD;             /* followed by ray values */
29  
30   #define packsiz(nr)     (sizeof(PACKHEAD)+(nr)*sizeof(RAYVAL))
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 78 | 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 109 | Line 112 | extern int     rtargc;         /* rtrace command */
112   extern char     *rtargv[];
113  
114   extern PACKET   *do_packets(), *get_packets(), *flush_queue();
115 +
116 + extern int16    *viewbeams();

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)