Changeset c43766 for molecuilder/src/tesselation.hpp

Timestamp:

Apr 21, 2010, 12:07:01 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

1f2e46

Parents:

7d1633

git-author:

Frederik Heber <heber@…> (04/21/10 11:51:53)

git-committer:

Frederik Heber <heber@…> (04/21/10 12:07:01)

Message:

Rewrite of tesselation: treatment of degenerated triangles and polygons

several tricks have been necessary to make it work for heptane:

• AddDegeneratedTriangle() is not used, instead AddCandidateTriangle() gets told which OptCenter to use, i.e. which triangle side to add
• afterwards, in the case of a polygon (multiple candidates for a baseline) we have to set the candidate of internal edges in the polygon to the next point, such that AddTesselationLine() picks the right one
• The we fill other open lines, needed in case of a degenerated triangle
• If CheckDegeneracy() - which removes all candidates from the ListOfPoints, not just the first - results in true
• Then we call AddCandidateTriangle() for the other side of it
• and again in the case of a polygon, set the candidate for the internal edge accordingly.

• new
  • Tesselation::FindCandidatesforOpenLines() - checks for OpenLines with no candidates and calls FindNextSuitableTriangle() for each
  • Tesselation::FindDegeneratedCandidatesforOpenLines() - sets the candidate of an open line between two points to a given point (for above polygons)
  • enum centers is either Opt or OtherOpt for normal or back side of the triangle, used in AddCandidateTriangle()

• associated changes:
  • Tesselation::CheckDegeneracy() - needs current CandidateForTesselation for Baseline's endpoints and candidate list (not just the current trianglre in TPS), removes these instead of TPS
  • lots of identation changes made by eclipse, bust mostly sensible, due to coding on other laptop before
  • Tesselation::AddCandidateTriangle() - picks OptCenter according to given enum centers
  • Tesselation::AddTesselationLine() - in polygon case, a base line may have multiple candidates, though with same OptCenter, we check all of these against desired ThirdNode
  • FindNonConvexBorder() - removed call of CorrectAllDegeneratedPolygons(), as they should be created correctly now

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/tesselation.hpp (modified) (5 diffs)

molecuilder/src/tesselation.hpp

@@ -89 +89 @@
 
 #define ListOfTesselPointList list<list <TesselPoint *> *>
+
+enum centers {Opt, OtherOpt};
 
 /********************************************** declarations *******************************/
@@ -284 +286 @@
     void AddTesselationTriangle();
     void AddTesselationTriangle(const int nr);
-    void AddCandidateTriangle(CandidateForTesselation &CandidateLine);
+    void AddCandidateTriangle(CandidateForTesselation &CandidateLine, enum centers type);
     void AddDegeneratedTriangle(CandidateForTesselation &CandidateLine, const double RADIUS, const LinkedCell *LC);
     void AddCandidatePolygon(CandidateForTesselation CandidateLine, const double RADIUS, const LinkedCell *LC);
@@ -290 +292 @@
     void RemoveTesselationLine(class BoundaryLineSet *line);
     void RemoveTesselationPoint(class BoundaryPointSet *point);
-    bool CheckDegeneracy(Vector *OtherOptCenter, const double RADIUS, const LinkedCell *LC) const;
+    bool CheckDegeneracy(CandidateForTesselation &CandidateLine, const double RADIUS, const LinkedCell *LC) const;
 
 
@@ -298 +300 @@
     void FindThirdPointForTesselation(const Vector &NormalVector, const Vector &SearchDirection, const Vector &OldSphereCenter, CandidateForTesselation &CandidateLine, const class BoundaryPointSet  * const ThirdNode, const double RADIUS, const LinkedCell *LC) const;
     bool FindNextSuitableTriangle(CandidateForTesselation &CandidateLine, const BoundaryTriangleSet &T, const double& RADIUS, const LinkedCell *LC);
+    bool FindCandidatesforOpenLines(const double RADIUS, const LinkedCell *&LCList);
     int CheckPresenceOfTriangle(class TesselPoint *Candidates[3]) const;
     class BoundaryTriangleSet * GetPresentTriangle(TesselPoint *Candidates[3]);
@@ -372 +375 @@
 
     //bool HasOtherBaselineBetterCandidate(const BoundaryLineSet * const BaseRay, const TesselPoint * const OptCandidate, double ShortestAngle, double RADIUS, const LinkedCell * const LC) const;
+    void FindDegeneratedCandidatesforOpenLines(TesselPoint * const Sprinter, const Vector * const OptCenter);
 };