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

Comparing ray/src/util/rmatrix.h (file contents):
Revision 2.8 by greg, Mon Aug 28 15:59:46 2017 UTC vs.
Revision 2.13 by greg, Tue Jan 19 23:32:00 2021 UTC

# Line 12 | Line 12
12   extern "C" {
13   #endif
14  
15 + /* Preferred BSDF component:
16 +        transmission, reflection front (normal side), reflection back */
17 + typedef enum {RMPtrans=0, RMPreflF, RMPreflB} RMPref;
18 +
19   /* General plane-ordered component matrix */
20   typedef struct {
21 <        int     nrows, ncols, ncomp;
22 <        int     dtype;
21 >        int     nrows, ncols;
22 >        short   ncomp;
23 >        uby8    dtype;
24 >        uby8    swapin;
25          char    *info;
26 <        double  mtx[1];                 /* extends struct */
26 >        double  mtx[3];                 /* extends struct */
27   } RMATRIX;
28  
29 < #define rmx_lval(rm,r,c,i)      (rm)->mtx[(i)+(rm)->ncomp*((c)+(rm)->ncols*(r))]
29 > #define rmx_lval(rm,r,c,i)      (rm)->mtx[(i)+(rm)->ncomp*((c)+(size_t)(rm)->ncols*(r))]
30  
31   /* Allocate a nr x nc matrix with n components */
32   extern RMATRIX  *rmx_alloc(int nr, int nc, int n);
# Line 32 | Line 38 | extern void    rmx_free(RMATRIX *rm);
38   extern int      rmx_newtype(int dtyp1, int dtyp2);
39  
40   /* Load matrix from supported file type (NULL for stdin, '!' with command) */
41 < extern RMATRIX  *rmx_load(const char *inspec);
41 > extern RMATRIX  *rmx_load(const char *inspec, RMPref rmp);
42  
43   /* Append header information associated with matrix data */
44   extern int      rmx_addinfo(RMATRIX *rm, const char *info);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines