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

Comparing ray/src/hd/rhd_sample.h (file contents):
Revision 3.8 by greg, Sat Feb 22 02:07:24 2003 UTC vs.
Revision 3.10 by schorsch, Mon Jul 14 22:24:00 2003 UTC

# Line 1 | Line 1
1   /* RCSid: $Id$ */
2   /*
3   * Sample data structures for holodeck display drivers.
4 + *
5 + * Include after "standard.h"
6   */
7 + #ifndef _RAD_RHD_SAMPLE_H_
8 + #define _RAD_RHD_SAMPLE_H_
9 +
10   #include "color.h"
11   #include "tonemap.h"
12   #include "rhdriver.h"
13   #include "object.h"
14  
15 < #ifndef int2
16 < #define int2    short
15 > #ifdef __cplusplus
16 > extern "C" {
17   #endif
13 #ifndef int4
14 #define int4    int
15 #endif
18  
19   #ifndef INVALID
20   #define INVALID  -1
# Line 26 | Line 28 | typedef OBJECT S_ID;
28  
29   typedef struct samp {
30          SFLOAT          (*wp)[3];       /* world intersection point array */
31 <        int4            *wd;            /* world direction array */
31 >        int32           *wd;            /* world direction array */
32          TMbright        *brt;           /* encoded brightness array */
33          BYTE            (*chr)[3];      /* encoded chrominance array */
34          BYTE            (*rgb)[3];      /* tone-mapped color array */
# Line 90 | Line 92 | typedef struct samp {
92  
93   extern  SAMP rsL;                      
94   extern double   sDepthEps;      /* epsilon to compare depths (z fraction) */
95 < extern int4     encodedir();    /* Encodes FVECT direction */
95 > extern int32    encodedir();    /* Encodes FVECT direction */
96   extern void     decodedir();    /* Decodes dir-> FVECT */
97   extern double   fdir2diff(), dir2diff(); /* Compare dir and FVECT */
98 < extern int4    *samp_flag;     /* Per/sample flags s */
98 > extern int32    *samp_flag;     /* Per/sample flags s */
99  
100   /* These values are set by the driver, and used in the OGL call for glFrustum*/
101   extern double dev_zmin,dev_zmax;
# Line 145 | Line 147 | extern S_ID sAlloc_samp();
147   */
148  
149  
150 <
150 > #ifdef __cplusplus
151 > }
152 > #endif
153 > #endif /* _RAD_RHD_SAMPLE_H_ */
154  
155  
156  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines