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

Comparing ray/src/common/tmesh.c (file contents):
Revision 2.2 by greg, Tue Mar 11 17:08:55 2003 UTC vs.
Revision 2.5 by greg, Thu Mar 2 17:16:56 2006 UTC

# Line 42 | Line 42 | FVECT  v1, v2, v3, n1, n2, n3;
42   int
43   comp_baryc(bcm, v1, v2, v3)             /* compute barycentric vectors */
44   register BARYCCM        *bcm;
45 < FLOAT                   *v1, *v2, *v3;
45 > RREAL                   *v1, *v2, *v3;
46   {
47 <        FLOAT   *vt;
47 >        RREAL   *vt;
48          FVECT   va, vab, vcb;
49          double  d;
50          int     ax0, ax1;
# Line 55 | Line 55 | FLOAT                  *v1, *v2, *v3;
55          VCROSS(va, vab, vcb);
56          bcm->ax = ABS(va[0]) > ABS(va[1]) ? 0 : 1;
57          bcm->ax = ABS(va[bcm->ax]) > ABS(va[2]) ? bcm->ax : 2;
58 <        ax0 = (bcm->ax + 1) % 3;
59 <        ax1 = (bcm->ax + 2) % 3;
58 >        if ((ax0 = bcm->ax + 1) >= 3) ax0 -= 3;
59 >        if ((ax1 = ax0 + 1) >= 3) ax1 -= 3;
60          for (i = 0; i < 2; i++) {
61                  vab[0] = v1[ax0] - v2[ax0];
62                  vcb[0] = v3[ax0] - v2[ax0];
# Line 87 | Line 87 | FLOAT                  *v1, *v2, *v3;
87  
88   void
89   eval_baryc(wt, p, bcm)          /* evaluate barycentric weights at p */
90 < FLOAT   wt[3];
90 > RREAL   wt[3];
91   FVECT   p;
92   register BARYCCM        *bcm;
93   {
94          double  u, v;
95 +        int     i;
96          
97 <        u = p[(bcm->ax + 1) % 3];
98 <        v = p[(bcm->ax + 2) % 3];
97 >        if ((i = bcm->ax + 1) >= 3) i -= 3;
98 >        u = p[i];
99 >        if (++i >= 3) i -= 3;
100 >        v = p[i];
101          wt[0] = u*bcm->tm[0][0] + v*bcm->tm[0][1] + bcm->tm[0][2];
102          wt[1] = u*bcm->tm[1][0] + v*bcm->tm[1][1] + bcm->tm[1][2];
103          wt[2] = 1. - wt[1] - wt[0];
# Line 103 | Line 106 | register BARYCCM       *bcm;
106  
107   int
108   get_baryc(wt, p, v1, v2, v3)    /* compute barycentric weights at p */
109 < FLOAT   wt[3];
109 > RREAL   wt[3];
110   FVECT   p;
111   FVECT   v1, v2, v3;
112   {
# Line 119 | Line 122 | FVECT  v1, v2, v3;
122   #if 0
123   int
124   get_baryc(wt, p, v1, v2, v3)    /* compute barycentric weights at p */
125 < FLOAT   wt[3];
125 > RREAL   wt[3];
126   FVECT   p;
127   FVECT   v1, v2, v3;
128   {
# Line 147 | Line 150 | FVECT  v1, v2, v3;
150   void
151   put_baryc(bcm, com, n)          /* put barycentric coord. vectors */
152   register BARYCCM        *bcm;
153 < register FLOAT          com[][3];
153 > register RREAL          com[][3];
154   int                     n;
155   {
156          double  a, b;
157 <        register int    i, j;
157 >        register int    i;
158  
159          printf("%d\t%d\n", 1+3*n, bcm->ax);
160          for (i = 0; i < n; i++) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines