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

Comparing ray/src/util/rmatrix.h (file contents):
Revision 2.5 by greg, Wed Aug 27 13:33:47 2014 UTC vs.
Revision 2.14 by greg, Fri Mar 4 01:27:12 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 {
17 –        int     nrows, ncols, ncomp;
18 –        int     dtype;
21          char    *info;
22 <        double  mtx[1];                 /* extends struct */
22 >        void    *mapped;
23 >        double  *mtx;
24 >        COLOR   cexp;
25 >        int     nrows, ncols;
26 >        short   ncomp;
27 >        uby8    dtype;
28 >        uby8    swapin;
29   } RMATRIX;
30  
31 < #define rmx_lval(rm,r,c,i)      (rm)->mtx[(i)+(rm)->ncomp*((c)+(rm)->ncols*(r))]
31 > #define rmx_lval(rm,r,c,i)      (rm)->mtx[(i)+(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 31 | Line 45 | extern void    rmx_free(RMATRIX *rm);
45   /* Resolve data type based on two input types (returns 0 for mismatch) */
46   extern int      rmx_newtype(int dtyp1, int dtyp2);
47  
48 < /* Load matrix from supported file type */
49 < extern RMATRIX  *rmx_load(const char *fname);
48 > /* Load matrix from supported file type (NULL for stdin, '!' with command) */
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);
53  
54   /* Write matrix to file type indicated by dtype */
55 < extern long     rmx_write(const RMATRIX *rm, int dtype, FILE *fp);
55 > extern int      rmx_write(const RMATRIX *rm, int dtype, FILE *fp);
56  
57   /* Allocate and assign square identity matrix with n components */
58   extern RMATRIX  *rmx_identity(int dim, int n);
# Line 51 | Line 65 | extern RMATRIX *rmx_transpose(const RMATRIX *rm);
65  
66   /* Multiply (concatenate) two matrices and allocate the result */
67   extern RMATRIX  *rmx_multiply(const RMATRIX *m1, const RMATRIX *m2);
68 +
69 + /* Element-wise multiplication (or division) of m2 into m1 */
70 + extern int      rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide);
71  
72   /* Sum second matrix into first, applying scale factor beforehand */
73   extern int      rmx_sum(RMATRIX *msum, const RMATRIX *madd, const double sf[]);

Diff Legend

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