Changeset eb58a7 for molecuilder/src/tesselation.hpp

Timestamp:

Aug 17, 2009, 10:30:53 AM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

3de1d2

Parents:

844cf5

Message:

documentation, some renames (..Triangle.. -> ..Tesselation..) and a bunch of new functions needed for ConvexizeNonconvexEnvelope()

• all of function documentation in place
• AddTriangle...() is now called AddTesselation...() which makes more sense, as they mainly add points, lines and triangles to the global tesselation lists
• New functions RemoveTesselation...() that erase points, lines and triangles and are counterparts to the AddTesselation...() functions (Note: They mostly do what the destructors did, only they erase also from global lists by not calling delete for subelements, but RemoveTesselation...() which does the job)
• ~BoundaryLineSet() checks whether both endpoints are still present, is more robust, as they may be missing from RemoveTesselation...()
• ~BoundaryTriangleSet() checks earlier whether lines are still present, same argument
• AddPoint() is now called AddBoundaryPoint(), works on *BPS array, AddTesselation...() work on *TPS array -> cleaner separation
• new function Tesselation::IsConvexRectangle() checks whether the rectangle made out of the four points of the two triangles with the same baseline in between, is convex or concave. this is needed for ConvexizeNonconvexEnvelope()
• Tesselation::CorrectConcaveBaselines() renamed to Tesselation::PickFarthestofTwoBaselines, which uses GetClosestPointBetweenLine() to check whether one baseline is above the other with respect to the BaseLineNormal vector and always modies the tesselation so that the higher one is used.
• new function GetClosestPointBetweenLine() which calculates the closest point on a line with respect to another line.
• new function Tesselation::FlipBaseline() does most of what CorrectConcaveBaseLine() did before only without the Convexity check (is done in boundary.cpp:Convexize...())
• Tesselation::GetCircleOfConnectedPoints() renamed to Tesselation::getNeighboursonCircleofConnectedPoints() and new function Tesselation::GetCircleOfConnectedPoints() which really returns just the circle of points, the renamed function works on the result of the new one.
• new function Tesselation::RemovePointFromTesselatedSurface() which just removes the point, re-creating its triangles with the remainder of the points to keep the surface closed.

File:

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

molecuilder/src/tesselation.hpp

@@ -78 +78 @@
     int LinesCount;
     TesselPoint *node;
+    double value;
     int Nr;
 };
@@ -190 +191 @@
     virtual ~Tesselation();
 
-    bool AddPoint(TesselPoint *Walker, int n);
-    void AddTrianglePoint(TesselPoint* Candidate, int n);
-    void AddTriangleLine(class BoundaryPointSet *a, class BoundaryPointSet *b, int n);
-    void AlwaysAddTriangleLine(class BoundaryPointSet *a, class BoundaryPointSet *b, int n);
-    void AddTriangle();
+    void AddTesselationPoint(TesselPoint* Candidate, int n);
+    void AddTesselationLine(class BoundaryPointSet *a, class BoundaryPointSet *b, int n);
+    void AlwaysAddTesselationTriangleLine(class BoundaryPointSet *a, class BoundaryPointSet *b, int n);
+    void AddTesselationTriangle();
+    void RemoveTesselationTriangle(class BoundaryTriangleSet *triangle);
+    void RemoveTesselationLine(class BoundaryLineSet *line);
+    void RemoveTesselationPoint(class BoundaryPointSet *point);
+
     bool IsInside(Vector *pointer);
     class BoundaryPointSet *GetCommonEndpoint(class BoundaryLineSet * line1, class BoundaryLineSet * line2);
@@ -209 +213 @@
     void GuessStartingTriangle(ofstream *out);
     bool InsertStraddlingPoints(ofstream *out, PointCloud *cloud, LinkedCell *LC);
-    bool CorrectConcaveBaselines(ofstream *out);
-
-    list<TesselPoint*> * getCircleOfConnectedPoints(ofstream *out, TesselPoint* Point, Vector* Reference);
+    double RemovePointFromTesselatedSurface(ofstream *out, class BoundaryPointSet *point);
+    bool FlipBaseline(ofstream *out, class BoundaryLineSet *Base);
+    bool PickFarthestofTwoBaselines(ofstream *out, class BoundaryLineSet *Base);
+    class BoundaryPointSet *IsConvexRectangle(ofstream *out, class BoundaryLineSet *Base);
+
+
+    list<TesselPoint*> * getCircleOfConnectedPoints(ofstream *out, TesselPoint* Point);
+    list<TesselPoint*> * getNeighboursonCircleofConnectedPoints(ofstream *out, list<TesselPoint*> *connectedPoints, TesselPoint* Point, Vector* Reference);
     list<BoundaryTriangleSet*> *FindTriangles(TesselPoint* Points[3]);
     list<BoundaryTriangleSet*> * FindClosestTrianglesToPoint(ofstream *out, Vector *x, LinkedCell* LC);
@@ -217 +226 @@
     bool IsInnerPoint(ofstream *out, Vector Point, LinkedCell* LC);
     bool IsInnerPoint(ofstream *out, TesselPoint *Point, LinkedCell* LC);
+    bool AddBoundaryPoint(TesselPoint *Walker, int n);
 
     PointMap PointsOnBoundary;
@@ -251 +261 @@
 TesselPoint* findSecondClosestPoint(const Vector*, LinkedCell*);
 double getAngle(const Vector &point, const Vector &reference, const Vector OrthogonalVector);
+Vector * GetClosestPointBetweenLine(ofstream *out, class BoundaryLineSet *Base, class BoundaryLineSet *OtherBase);
 
 #endif /* TESSELATION_HPP_ */