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.11 by greg, Tue Sep 3 23:43:07 2019 UTC vs.
Revision 2.15 by greg, Sat Mar 5 01:45:21 2022 UTC

# Line 12 | Line 12
12   extern "C" {
13   #endif
14  
15 < /* General plane-ordered component matrix */
15 > /* Preferred BSDF component:
16 >        transmission, reflection front (normal side), reflection back */
17 > typedef enum {RMPtrans=0, RMPreflF, RMPreflB} RMPref;
18 >
19 > /* General [row][col][cmp] component matrix */
20   typedef struct {
21 +        char    *info;
22 +        void    *mapped;
23 +        double  *mtx;
24 +        COLOR   cexp;
25          int     nrows, ncols;
26          short   ncomp;
27          uby8    dtype;
28          uby8    swapin;
21        char    *info;
22        double  mtx[1];                 /* extends struct */
29   } RMATRIX;
30  
31 < #define rmx_lval(rm,r,c,i)      (rm)->mtx[(i)+(rm)->ncomp*((c)+(size_t)(rm)->ncols*(r))]
31 > #define rmx_lval(rm,r,c)        ((rm)->mtx + (rm)->ncomp*((c)+(size_t)(rm)->ncols*(r)))
32  
33 < /* Allocate a nr x nc matrix with n components */
33 > /* Initialize a RMATRIX struct but don't allocate array space */
34 > extern RMATRIX  *rmx_new(int nr, int nc, int n);
35 >
36 > /* Prepare a RMATRIX for writing (allocate array if needed) */
37 > extern int      rmx_prepare(RMATRIX *rm);
38 >
39 > /* Call rmx_new() and rmx_prepare() */
40   extern RMATRIX  *rmx_alloc(int nr, int nc, int n);
41  
42   /* Free a RMATRIX array */
# Line 34 | Line 46 | extern void    rmx_free(RMATRIX *rm);
46   extern int      rmx_newtype(int dtyp1, int dtyp2);
47  
48   /* Load matrix from supported file type (NULL for stdin, '!' with command) */
49 < extern RMATRIX  *rmx_load(const char *inspec);
49 > extern RMATRIX  *rmx_load(const char *inspec, RMPref rmp);
50  
51   /* Append header information associated with matrix data */
52   extern int      rmx_addinfo(RMATRIX *rm, const char *info);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines