/[libvob]/libvob/include/vob/vobs/Fillet.hxx
ViewVC logotype

Diff of /libvob/include/vob/vobs/Fillet.hxx

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.22 by jvk, Tue Jun 24 14:30:04 2003 UTC revision 1.23 by jvk, Wed Jun 25 09:44:11 2003 UTC
# Line 163  struct FilletSpan2 { Line 163  struct FilletSpan2 {
163              // XXX: interpolate angle to zero from the point of              // XXX: interpolate angle to zero from the point of
164              // "overlap" (i.e., where the beginning and end of the side              // "overlap" (i.e., where the beginning and end of the side
165              // of a fillet meet) to when the nodes coincide.              // of a fillet meet) to when the nodes coincide.
166              float f = d / r0;              float f = d / (cos(a) * r0);
167              if (f < 1.0) a = asin(t / r0) * sin(M_PI_2 * f);              if (f < 1.0) a = asin(t / r0) * sin(M_PI_2 * f);
168    
169              DBG(dbg_vfillets) <<              DBG(dbg_vfillets) <<
# Line 312  struct FilletSpan2 { Line 312  struct FilletSpan2 {
312          float th1 = conn1.th;          float th1 = conn1.th;
313          float th2 = conn2.th;          float th2 = conn2.th;
314    
315          bool overlap1 = 2 * d1 <= (csize + crad(t1)) * cos(conn1.a);          bool overlap1 = d1 <= csize * cos(conn1.a);
316          bool overlap2 = 2 * d2 <= (csize + crad(t2)) * cos(conn2.a);          bool overlap2 = d2 <= csize * cos(conn2.a);
317    
318          DBG(dbg_vfillets) << "P: "<<ctr<<" "<<csize<<" "<<          DBG(dbg_vfillets) << "P: "<<ctr<<" "<<csize<<" "<<
319                      a1<<" "<<d1<<" "<<th1<<" "<<                      a1<<" "<<d1<<" "<<th1<<" "<<

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.23

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26