ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/bsdf_m.h
(Generate patch)

Comparing ray/src/common/bsdf_m.h (file contents):
Revision 3.3 by greg, Sat Feb 19 01:48:59 2011 UTC vs.
Revision 3.4 by greg, Fri Apr 8 18:13:48 2011 UTC

# Line 2 | Line 2
2   /*
3   *  bsdf_m.h
4   *  
5 < *  Support for BSDF matrices
5 > *  Support for BSDF matrices.
6 > *  Assumes "bsdf.h" already included.
7 > *  Include after "ezxml.h" for SDloadMtx() declaration.
8   *
9   *  Created by Greg Ward on 2/2/11.
10   *
# Line 15 | Line 17
17   extern "C" {
18   #endif
19                                  /* Fixed-position coordinate functions */
20 < typedef int     b_vecf(FVECT vec, int ndx, double randX, void *c_data);
20 > typedef int     b_vecf(FVECT vec, double ndxr, void *c_data);
21   typedef int     b_ndxf(const FVECT vec, void *c_data);
22   typedef double  b_ohmf(int ndx, void *c_data);
23  
# Line 35 | Line 37 | typedef struct {
37   } SDMat;
38  
39   /* Matrix BSDF accessors */
40 < #define mBSDF_incvec(v,b,i)     (*(b)->ib_vec)(v,i,(b)->ib_priv)
40 > #define mBSDF_incvec(v,b,ix)    (*(b)->ib_vec)(v,ix,(b)->ib_priv)
41   #define mBSDF_incndx(b,v)       (*(b)->ib_ndx)(v,(b)->ib_priv)
42   #define mBSDF_incohm(b,i)       (*(b)->ib_ohm)(i,(b)->ib_priv)
43 < #define mBSDF_outvec(v,b,o)     (*(b)->ob_vec)(v,o,(b)->ob_priv)
43 > #define mBSDF_outvec(v,b,ox)    (*(b)->ob_vec)(v,ox,(b)->ob_priv)
44   #define mBSDF_outndx(b,v)       (*(b)->ob_ndx)(v,(b)->ob_priv)
45   #define mBSDF_outohm(b,o)       (*(b)->ob_ohm)(o,(b)->ob_priv)
46   #define mBSDF_value(b,i,o)      (b)->bsdf[(o)*(b)->ninc + (i)]
# Line 53 | Line 55 | typedef struct {
55          unsigned        carr[1];        /* cumulative array (extends struct) */
56   } SDMatCDst;    
57  
58 + #ifdef _EZXML_H
59   /* Load a set of BSDF matrices from an open XML file */
60   extern SDError          SDloadMtx(SDData *sd, ezxml_t wtl);
61 + #endif
62  
63   /* Our matrix handling routines */
64   extern SDFunc           SDhandleMtx;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines