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

Comparing ray/src/rt/ambient.h (file contents):
Revision 2.26 by greg, Mon Mar 7 17:52:14 2022 UTC vs.
Revision 2.27 by greg, Wed Nov 15 18:02:52 2023 UTC

# Line 22 | Line 22 | typedef struct ambrec {
22          short  lvl;             /* recursion level of parent ray */
23          float  weight;          /* weight of parent ray */
24          float  rad[2];          /* anisotropic radii (rad[0] <= rad[1]) */
25 –        COLOR  val;             /* computed ambient value */
25          float  gpos[2];         /* (u,v) gradient wrt. position */
26          float  gdir[2];         /* (u,v) gradient wrt. direction */
27          uint32  corral;         /* potential light leak direction flags */
28 +        SCOLOR  val;            /* computed indirect irradiance (last!) */
29   }  AMBVAL;                      /* ambient value */
30  
31   typedef struct ambtree {
# Line 40 | Line 40 | extern double  minarad;                /* minimum ambient radius */
40   #define  AVGREFL        0.5     /* assumed average reflectance */
41   #endif
42  
43 < #define  AMBVALSIZ      67      /* number of bytes in portable AMBVAL struct */
44 < #define  AMBMAGIC       559     /* magic number for ambient value files */
43 > #define  AMBVALSIZ      (64+AMB_CNDX[3])        /* number of bytes in portable AMBVAL */
44 > #define  AMBMAGIC       561                     /* magic number for ambient value file */
45   #define  AMBFMT         "Radiance_ambval"       /* format id string */
46  
47                                          /* defined in ambient.c */
48   extern void     setambres(int ar);
49   extern void     setambacc(double newa);
50   extern void     setambient(void);
51 < extern void     multambient(COLOR aval, RAY *r, FVECT nrm);
51 > extern void     multambient(SCOLOR aval, RAY *r, FVECT nrm);
52   extern void     ambdone(void);
53   extern void     ambnotify(OBJECT obj);
54   extern int      ambsync(void);
55                                          /* defined in ambcomp.c */
56 < extern int      doambient(COLOR acol, RAY *r, double wt,
56 > extern int      doambient(SCOLOR acol, RAY *r, double wt,
57                                  FVECT uv[2], float rad[2],
58                                  float gpos[2], float gdir[2], uint32 *crlp);
59                                          /* defined in ambio.c */
60 + extern int      *AMB_CNDX;      /* open ambient file RGBE indices */
61 + extern float    *AMB_WLPART;    /* open ambient file spectral range */
62 + extern int      amb_headline(char *hl, void *p);
63   extern void     putambmagic(FILE *fp);
64   extern int      hasambmagic(FILE *fp);
65   extern int      writambval(AMBVAL *av, FILE *fp);

Diff Legend

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