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

Comparing ray/src/util/cmatrix.h (file contents):
Revision 2.12 by greg, Wed Mar 25 01:51:09 2020 UTC vs.
Revision 2.15 by greg, Fri Apr 4 18:06:48 2025 UTC

# Line 15 | Line 15
15   extern "C" {
16   #endif
17  
18 < /* Data types for file loading */
19 < enum {DTfromHeader=0, DTrgbe, DTxyze, DTfloat, DTascii, DTdouble, DTend};
18 > /* Data types for file loading (used to be an enum) */
19 > #define DTfromHeader    0
20 > #define DTrgbe          1
21 > #define DTxyze          2
22 > #define DTspec          3
23 > #define DTfloat         4
24 > #define DTascii         5
25 > #define DTdouble        6
26 > #define DTend           7
27  
28 + extern const char       stdin_name[];
29   extern const char       *cm_fmt_id[];
30   extern const int        cm_elem_size[];
31  
# Line 58 | Line 66 | extern CMATRIX *cm_multiply(const CMATRIX *cm1, const
66   extern int      cm_write(const CMATRIX *cm, int dtype, FILE *fp);
67  
68   /* Load and convert a matrix BTDF from the given XML file */
69 < extern CMATRIX  *cm_loadBTDF(char *fname);
69 > extern CMATRIX  *cm_loadBTDF(const char *fname);
70 >
71 > /* Load and convert a matrix BRDF from the given XML file */
72 > extern CMATRIX  *cm_loadBRDF(const char *fname, int backside);
73  
74   #ifdef __cplusplus
75   }

Diff Legend

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