/[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.25 by jvk, Wed Jun 25 13:15:21 2003 UTC revision 1.26 by jvk, Wed Jun 25 14:26:46 2003 UTC
# Line 151  struct FilletSpan2 { Line 151  struct FilletSpan2 {
151              float r = lerp(r0, r1, .5);              float r = lerp(r0, r1, .5);
152              th = r * thick_t.transform(ZVec(d / r, 0, 0)).x;              th = r * thick_t.transform(ZVec(d / r, 0, 0)).x;
153    
154              a = angle_t.transform(ZVec(d / r, 0, 0)).x;              a = atan(angle_t.transform(ZVec(d / r, 0, 0)).x);
155    
156              // XXX: prevent the connection from being thicker than the node              // XXX: prevent the connection from being thicker than the node
157              //if (th > 2 * r0) th = 2 * r0;              //if (th > 2 * r0) th = 2 * r0;
# Line 170  struct FilletSpan2 { Line 170  struct FilletSpan2 {
170              float at = asin((t + r2) / (r0 + r2));              float at = asin((t + r2) / (r0 + r2));
171              if (a > at) a = at;              if (a > at) a = at;
172    
173              // XXX: interpolate angle to zero from the point of              // XXX: interpolate the "tangent" angle to zero from the point of
174              // "overlap" (i.e., where the beginning and end of the side              // "overlap" (i.e., where the beginning and end of the side
175              // of a fillet meet) to where the nodes coincide.              // of a fillet meet) to where the nodes coincide.
176              float f = d / (cos(aw) * r0);              float f = d / (cos(aw) * r0);

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.26

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