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

Comparing ray/src/rt/ray.h (file contents):
Revision 2.51 by greg, Wed Nov 15 18:02:53 2023 UTC vs.
Revision 2.57 by greg, Fri Nov 15 20:47:42 2024 UTC

# Line 23 | Line 23 | extern "C" {
23  
24                                  /* ray type flags */
25   #define  PRIMARY        01              /* original ray */
26 < #define  SHADOW         02              /* ray to light source */
26 > #define  RSHADOW        02              /* reflected ray to light source */
27   #define  REFLECTED      04              /* reflected ray */
28   #define  REFRACTED      010             /* refracted (bent) ray */
29   #define  TRANS          020             /* transmitted/transferred ray */
30 < #define  AMBIENT        040             /* ray scattered for interreflection */
31 < #define  SPECULAR       0100            /* ray scattered for specular */
30 > #define  RAMBIENT       040             /* reflected diffuse interreflection */
31 > #define  RSPECULAR      0100            /* reflected specular */
32 > #define  TSHADOW        0200            /* transmitted shadow */
33 > #define  TAMBIENT       0400            /* transmitted ambient */
34 > #define  TSPECULAR      01000           /* transmitted specular */
35 > #define  SHADOW         (RSHADOW|TSHADOW)
36 > #define  AMBIENT        (RAMBIENT|TAMBIENT)
37 > #define  SPECULAR       (RSPECULAR|TSPECULAR)
38  
39                                  /* reflected ray types */
40 < #define  RAYREFL        (SHADOW|REFLECTED|AMBIENT|SPECULAR)
40 > #define  RAYREFL        (RSHADOW|REFLECTED|RAMBIENT|RSPECULAR)
41  
42   /* Arrange so double's come first for optimal alignment */
43   /* Pointers and long's come second for 64-bit mode */
# Line 58 | Line 64 | typedef struct ray {
64          int     *slights;       /* list of lights to test for scattering */
65          RNUMBER rno;            /* unique ray number */
66          OBJECT  robj;           /* intersected object number */
67 <        int     rsrc;           /* source we're aiming for */
67 >        int     rsrc;           /* source we're aiming for (or ones to skip) */
68 > #ifdef SSKIPOPT
69 >        float   scorr;          /* correction factor for included sources */
70 > #endif
71          float   rweight;        /* cumulative weight (for termination) */
72          float   gecc;           /* scattering eccentricity coefficient */
73          SCOLOR  rcoef;          /* contribution coefficient w.r.t. parent */
# Line 75 | Line 84 | typedef struct ray {
84  
85   #define  rayvalue(r)    (*(r)->revf)(r)
86  
87 + #define  thrudir(r,v)   ((r)->rod > 0 ^ DOT((r)->ron,v) > 0)
88 +
89   #define  raydistance(r) (pbright((r)->mcol) > 0.5*pbright((r)->rcol) ? \
90                                  (r)->rmt : (r)->rxt)
91  
# Line 197 | Line 208 | extern void    free_objmem(void);
208                                          /* defined in preload.c */
209   extern int      load_os(OBJREC *op);
210   extern void     preload_objs(void);
211 + extern char     *shm_boundary;
212 + extern void     cow_memshare(void);
213 + extern void     cow_doneshare(void);
214                                          /* defined in raycalls.c */
215   extern void     ray_init(char *otnm);
216   extern void     ray_trace(RAY *r);
# Line 240 | Line 254 | extern int     feature_status(int ac, char *av[]);
254   extern int      getrenderopt(int ac, char *av[]);
255   extern void     print_rdefaults(void);
256                                          /* defined in srcdraw.c */
243 extern void     drawsources(COLOR *pic[], float *zbf[],
244                        int x0, int xsiz, int y0, int ysiz);
257   extern void     init_drawsources(int rad);
258 + extern void     drawsources(COLORV *pic[], RGBPRIMP primp, float *zbf[],
259 +                        int x0, int xsiz, int y0, int ysiz);
260                                          /* defined in rt/initotypes.c */
261   extern void     initotypes(void);
262                                          /* module main procedures */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines