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

Comparing ray/src/rt/ray.h (file contents):
Revision 2.50 by greg, Thu Mar 16 00:25:24 2023 UTC vs.
Revision 2.51 by greg, Wed Nov 15 18:02:53 2023 UTC

# Line 19 | Line 19 | extern "C" {
19   #define RNUMBER         size_t          /* ray counter (>= sizeof pointer) */
20   #endif
21  
22 < #define  MAXDIM         32      /* maximum number of dimensions */
22 > #define  MAXDIM         32      /* maximum number of sampling dimensions */
23  
24                                  /* ray type flags */
25   #define  PRIMARY        01              /* original ray */
# Line 61 | Line 61 | typedef struct ray {
61          int     rsrc;           /* source we're aiming for */
62          float   rweight;        /* cumulative weight (for termination) */
63          float   gecc;           /* scattering eccentricity coefficient */
64 <        COLOR   rcoef;          /* contribution coefficient w.r.t. parent */
65 <        COLOR   pcol;           /* pattern color */
66 <        COLOR   mcol;           /* mirrored color contribution */
67 <        COLOR   rcol;           /* returned radiance value */
64 >        SCOLOR  rcoef;          /* contribution coefficient w.r.t. parent */
65 >        SCOLOR  pcol;           /* pattern color */
66 >        SCOLOR  mcol;           /* mirrored color contribution */
67 >        SCOLOR  rcol;           /* returned radiance value */
68          COLOR   cext;           /* medium extinction coefficient */
69          COLOR   albedo;         /* medium scattering albedo */
70          short   rflips;         /* surface orientation has been reversed */
# Line 75 | Line 75 | typedef struct ray {
75  
76   #define  rayvalue(r)    (*(r)->revf)(r)
77  
78 < #define  raydistance(r) (bright((r)->mcol) > 0.5*bright((r)->rcol) ? \
78 > #define  raydistance(r) (pbright((r)->mcol) > 0.5*pbright((r)->rcol) ? \
79                                  (r)->rmt : (r)->rxt)
80  
81   #define  rayreorient(r) if ((r)->rflips & 1) flipsurface(r); else
# Line 217 | Line 217 | extern int     (*ray_fifo_out)(RAY *r);
217   extern int      ray_fifo_in(RAY *r);
218   extern int      ray_fifo_flush(void);
219                                          /* defined in raytrace.c */
220 < extern int      rayorigin(RAY *r, int rt, const RAY *ro, const COLOR rc);
220 > extern int      rayorigin(RAY *r, int rt, const RAY *ro, const SCOLOR rc);
221   extern void     rayclear(RAY *r);
222   extern void     raytrace(RAY *r);
223   extern int      rayreject(OBJREC *o, RAY *r, double t, double rod);
# Line 229 | Line 229 | extern int     rayshade(RAY *r, int mod);
229   extern void     rayparticipate(RAY *r);
230   extern void     raytexture(RAY *r, OBJECT mod);
231   extern int      raymixture(RAY *r, OBJECT fore, OBJECT back, double coef);
232 < extern void     raycontrib(RREAL rc[3], const RAY *r, int flags);
232 > extern void     raycontrib(SCOLOR rc, const RAY *r, int flags);
233   extern double   raydist(const RAY *r, int flags);
234   extern double   raynormal(FVECT norm, RAY *r);
235   extern void     newrayxf(RAY *r);

Diff Legend

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