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.22 by greg, Tue Jun 4 21:23:11 2024 UTC vs.
Revision 2.27 by greg, Fri Apr 18 23:59:03 2025 UTC

# Line 12 | Line 12
12   extern "C" {
13   #endif
14  
15 < /* Preferred BSDF component:
16 <        none, transmission, reflection front (normal side), reflection back */
17 < typedef enum {RMPnone=-1, RMPtrans=0, RMPreflF, RMPreflB} RMPref;
18 <
19 < /* Private flags:
20 <        need to swap input, need to free/unmap memory */
15 > /* RMATRIX flags (usually private):
16 >        need to swap input, we should free memory */
17   #define RMF_SWAPIN      1
18 < #define RMF_OURMEM      2
18 > #define RMF_FREEMEM     2
19  
20 < #define DTrmx_native    DTdouble        /* in-core data type */
20 > #ifndef MAXCOMP
21 > #define MAXCOMP         MAXCSAMP        /* #components we support */
22 > #endif
23 >                                        /* Set in-core data type */
24 > #if !defined(DTrmx_native) || DTrmx_native==DTfloat
25 > #define DTrmx_native    DTfloat
26 > #define rmx_dtype       float
27 > #define rmx_scanfmt     "%f"
28 > #elif DTrmx_native==DTdouble
29 > #define rmx_dtype       double
30 > #define rmx_scanfmt     "%lf"
31 > #endif
32  
33   /* General [row][col][cmp] component matrix */
34   typedef struct {
35 <        char    *info;
36 <        void    *mapped;
37 <        double  *mtx;
38 <        COLOR   cexp;
39 <        float   wlpart[4];
40 <        int     nrows, ncols;
41 <        short   ncomp;
42 <        uby8    dtype;
43 <        uby8    pflags;
35 >        char            *info;
36 >        void            *mapped;
37 >        rmx_dtype       *mtx;
38 >        COLOR           cexp;
39 >        float           wlpart[4];
40 >        int             nrows, ncols;
41 >        short           ncomp;
42 >        uby8            dtype;
43 >        uby8            pflags;
44   } RMATRIX;
45  
46   #define rmx_lval(rm,r,c)        ((rm)->mtx + (rm)->ncomp*((c)+(size_t)(rm)->ncols*(r)))
47   #define rmx_val                 rmx_lval
48  
49 < #define rmx_array_size(rm)      (sizeof(double)*(rm)->nrows*(rm)->ncols*(rm)->ncomp)
49 > #define rmx_array_size(rm)      (sizeof(rmx_dtype)*(rm)->nrows*(rm)->ncols*(rm)->ncomp)
50   #define rmx_mapped_size(rm)     ((char *)(rm)->mtx + rmx_array_size(rm) - (char *)(rm)->mapped)
51  
52   /* Initialize a RMATRIX struct but don't allocate array space */
# Line 63 | Line 70 | extern int     rmx_newtype(int dtyp1, int dtyp2);
70   /* Read matrix header from input stream (cannot be XML) */
71   extern int      rmx_load_header(RMATRIX *rm, FILE *fp);
72  
73 < /* Load next row as double (cannot be XML) */
74 < extern int      rmx_load_row(double *drp, const RMATRIX *rm, FILE *fp);
73 > /* Load next row as rmx_dtype (cannot be XML) */
74 > extern int      rmx_load_row(rmx_dtype *drp, const RMATRIX *rm, FILE *fp);
75  
76   /* Allocate & load post-header data from stream given type set in rm->dtype */
77   extern int      rmx_load_data(RMATRIX *rm, FILE *fp);
78  
79   /* Load matrix from supported file type (NULL for stdin, '!' with command) */
80 < extern RMATRIX  *rmx_load(const char *inspec, RMPref rmp);
80 > extern RMATRIX  *rmx_load(const char *inspec);
81  
82   /* Append header information associated with matrix data */
83   extern int      rmx_addinfo(RMATRIX *rm, const char *info);
# Line 79 | Line 86 | extern int     rmx_addinfo(RMATRIX *rm, const char *info);
86   extern int      rmx_write_header(const RMATRIX *rm, int dtype, FILE *fp);
87  
88   /* Write out matrix data (usually by row) */
89 < extern int      rmx_write_data(const double *dp, int nc, int len,
89 > extern int      rmx_write_data(const rmx_dtype *dp, int nc, int len,
90                                  int dtype, FILE *fp);
91  
92   /* Write matrix using file format indicated by dtype */
# Line 94 | Line 101 | extern RMATRIX *rmx_copy(const RMATRIX *rm);
101   /* Replace data in first matrix with data from second */
102   extern int      rmx_transfer_data(RMATRIX *rdst, RMATRIX *rsrc, int dometa);
103  
104 < /* Allocate and assign transposed matrix */
105 < extern RMATRIX  *rmx_transpose(const RMATRIX *rm);
104 > /* Transpose the given matrix */
105 > extern int      rmx_transpose(RMATRIX *rm);
106  
107   /* Multiply (concatenate) two matrices and allocate the result */
108   extern RMATRIX  *rmx_multiply(const RMATRIX *m1, const RMATRIX *m2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines