--- ray/src/util/rmatrix.h	2014/08/01 23:37:24	2.3
+++ ray/src/util/rmatrix.h	2021/01/19 23:32:00	2.13
@@ -1,4 +1,4 @@
-/* RCSid $Id: rmatrix.h,v 2.3 2014/08/01 23:37:24 greg Exp $ */
+/* RCSid $Id: rmatrix.h,v 2.13 2021/01/19 23:32:00 greg Exp $ */
 /*
  * Header file for general matrix routines.
  */
@@ -12,28 +12,39 @@
 extern "C" {
 #endif
 
+/* Preferred BSDF component:
+	transmission, reflection front (normal side), reflection back */
+typedef enum {RMPtrans=0, RMPreflF, RMPreflB} RMPref;
+
 /* General plane-ordered component matrix */
 typedef struct {
-	int	nrows, ncols, ncomp;
+	int	nrows, ncols;
+	short	ncomp;
+	uby8	dtype;
+	uby8	swapin;
 	char	*info;
-	double	mtx[1];			/* extends struct */
+	double	mtx[3];			/* extends struct */
 } RMATRIX;
 
-#define rmx_lval(rm,r,c,i)	(rm)->mtx[((i)*(rm)->nrows+(r))*(rm)->ncols+(c)]
+#define rmx_lval(rm,r,c,i)	(rm)->mtx[(i)+(rm)->ncomp*((c)+(size_t)(rm)->ncols*(r))]
 
-#define rmx_free(rm)		free(rm)
-
 /* Allocate a nr x nc matrix with n components */
 extern RMATRIX	*rmx_alloc(int nr, int nc, int n);
 
-/* Load matrix from supported file type */
-extern RMATRIX	*rmx_load(const char *fname);
+/* Free a RMATRIX array */
+extern void	rmx_free(RMATRIX *rm);
 
+/* Resolve data type based on two input types (returns 0 for mismatch) */
+extern int	rmx_newtype(int dtyp1, int dtyp2);
+
+/* Load matrix from supported file type (NULL for stdin, '!' with command) */
+extern RMATRIX	*rmx_load(const char *inspec, RMPref rmp);
+
 /* Append header information associated with matrix data */
 extern int	rmx_addinfo(RMATRIX *rm, const char *info);
 
-/* Write matrix to file type indicated by dt */
-extern long	rmx_write(const RMATRIX *rm, int dtype, FILE *fp);
+/* Write matrix to file type indicated by dtype */
+extern int	rmx_write(const RMATRIX *rm, int dtype, FILE *fp);
 
 /* Allocate and assign square identity matrix with n components */
 extern RMATRIX	*rmx_identity(int dim, int n);
@@ -46,6 +57,9 @@ extern RMATRIX	*rmx_transpose(const RMATRIX *rm);
 
 /* Multiply (concatenate) two matrices and allocate the result */
 extern RMATRIX	*rmx_multiply(const RMATRIX *m1, const RMATRIX *m2);
+
+/* Element-wise multiplication (or division) of m2 into m1 */
+extern int	rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide);
 
 /* Sum second matrix into first, applying scale factor beforehand */
 extern int	rmx_sum(RMATRIX *msum, const RMATRIX *madd, const double sf[]);