Changeset af20f3 for molecuilder/src

Timestamp:

Apr 22, 2010, 8:09:48 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

d2390d

Parents:

f07455

Message:

BUGFIX in Tesselation::FindThirdPointForTesselation() - ThirdPoint of the base triangle must never have the smaller angle, but must always be the backside (i.e. the other center).

• this fixes a bug with CNTorus (16,0) with (56,1) (l,r) working and (57,1) not, due to angle suddenly being 0 for the same as the base triangle.

File:

• molecuilder/src/tesselation.cpp (modified) (1 diff)

molecuilder/src/tesselation.cpp

@@ -3278 +3278 @@
                         alpha = GetPathLengthonCircumCircle(CircleCenter, CirclePlaneNormal, CircleRadius, NewSphereCenter, OldSphereCenter, NormalVector, SearchDirection);
                         Otheralpha = GetPathLengthonCircumCircle(CircleCenter, CirclePlaneNormal, CircleRadius, OtherNewSphereCenter, OldSphereCenter, NormalVector, SearchDirection);
-                        alpha = min(alpha, Otheralpha);
+                        if ((ThirdPoint != NULL) && (Candidate == ThirdPoint->node)) { // in that case only the other circlecenter is valid
+                          if (OldSphereCenter.DistanceSquared(&NewSphereCenter) < OldSphereCenter.DistanceSquared(&OtherNewSphereCenter))
+                            alpha = Otheralpha;
+                        } else
+                          alpha = min(alpha, Otheralpha);
 
                         // if there is a better candidate, drop the current list and add the new candidate