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

Comparing ray/src/rt/o_mesh.c (file contents):
Revision 2.14 by greg, Tue Jul 8 18:25:00 2014 UTC vs.
Revision 2.15 by greg, Fri Mar 1 02:03:33 2019 UTC

# Line 130 | Line 130 | RAY    *r;
130                          continue;               /* ray is tangent */
131                  VSUB(va, tv[0].v, r->rorg);
132                  d = DOT(va, nrm) / d;
133 <                if (d <= FTINY || d >= r->rot)
133 >                if ((d <= FTINY) | (d >= r->rot))
134                          continue;               /* not good enough */
135                  r->robj = oset[i];              /* else record hit */
136                  r->ro = edge_cache.o;
# Line 181 | Line 181 | o_mesh(                        /* compute ray intersection with a mesh */
181          if (!(flags & MT_V))
182                  objerror(o, INTERNAL, "missing mesh vertices in o_mesh");
183          r->robj = objndx(o);            /* set object and material */
184 <        if (o->omod == OVOID && tmod != OVOID) {
184 >        if ((o->omod == OVOID) & (tmod != OVOID)) {
185                  r->ro = getmeshpseudo(curmsh, tmod);
186                  r->rox = &curmi->x;
187          } else
# Line 210 | Line 210 | o_mesh(                        /* compute ray intersection with a mesh */
210                                          wt[2]*tv[2].uv[i];
211          else
212                  r->uv[0] = r->uv[1] = .0;
213 <
214 <                                        /* return hit */
215 <        return(1);
213 >                
214 >        return(1);                      /* return hit */
215   }

Diff Legend

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