Changes in src/tesselation.hpp [f66195:7c14ec]

File:

• src/tesselation.hpp (modified) (9 diffs)

src/tesselation.hpp

@@ -13 +13 @@
 using namespace std;
 
-/*********************************************** includes ***********************************/
-
 // include config.h
 #ifdef HAVE_CONFIG_H
@@ -24 +22 @@
 #include <set>
 
+
+#include "helpers.hpp"
+#include "linkedcell.hpp"
+#include "tesselationhelpers.hpp"
 #include "vector.hpp"
-
-/****************************************** forward declarations *****************************/
 
 class BoundaryPointSet;
 class BoundaryLineSet;
 class BoundaryTriangleSet;
-class LinkedCell;
 class TesselPoint;
 class PointCloud;
 class Tesselation;
-
-/********************************************** definitions *********************************/
-
-#define DoTecplotOutput 1
-#define DoRaster3DOutput 1
-#define DoVRMLOutput 1
-#define TecplotSuffix ".dat"
-#define Raster3DSuffix ".r3d"
-#define VRMLSUffix ".wrl"
 
 // ======================================================= some template functions =========================================
@@ -63 +53 @@
 #define DistanceMultiMapPair pair <double, pair < PointMap::iterator, PointMap::iterator> >
 
-/********************************************** declarations *******************************/
+
 
 template <typename T> void SetEndpointsOrdered(T endpoints[2], T endpoint1, T endpoint2)
@@ -125 +115 @@
 
     void GetNormalVector(Vector &NormalVector);
-    void GetCenter(Vector *center);
     bool GetIntersectionInsideTriangle(ofstream *out, Vector *MolCenter, Vector *x, Vector *Intersection);
     bool ContainsBoundaryLine(class BoundaryLineSet *line);
     bool ContainsBoundaryPoint(class BoundaryPointSet *point);
-    bool ContainsBoundaryPoint(class TesselPoint *point);
     class BoundaryPointSet *GetThirdEndpoint(class BoundaryLineSet *line);
     bool IsPresentTupel(class BoundaryPointSet *Points[3]);
-    bool IsPresentTupel(class BoundaryTriangleSet *T);
+    void GetCenter(Vector *center);
 
     class BoundaryPointSet *endpoints[3];
@@ -208 +196 @@
     void AlwaysAddTesselationTriangleLine(class BoundaryPointSet *a, class BoundaryPointSet *b, int n);
     void AddTesselationTriangle();
-    void AddTesselationTriangle(int nr);
     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);
 
     // concave envelope
     void FindStartingTriangle(ofstream *out, const double RADIUS, class LinkedCell *LC);
-    void FindSecondPointForTesselation(class TesselPoint* a, Vector Oben, class TesselPoint*& OptCandidate, double Storage[3], double RADIUS, class LinkedCell *LC);
+    void FindSecondPointForTesselation(class TesselPoint* a, class TesselPoint* Candidate, Vector Oben, class TesselPoint*& OptCandidate, double Storage[3], double RADIUS, class LinkedCell *LC);
     void FindThirdPointForTesselation(Vector NormalVector, Vector SearchDirection, Vector OldSphereCenter, class BoundaryLineSet *BaseLine, class TesselPoint *ThirdNode, CandidateList* &candidates, double *ShortestAngle, const double RADIUS, class LinkedCell *LC);
-    bool FindNextSuitableTriangle(ofstream *out, BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, LinkedCell *LC);
+    bool FindNextSuitableTriangle(ofstream *out, BoundaryLineSet &Line, BoundaryTriangleSet &T, const double& RADIUS, int N, LinkedCell *LC);
     int CheckPresenceOfTriangle(ofstream *out, class TesselPoint *Candidates[3]);
-    class BoundaryTriangleSet * GetPresentTriangle(ofstream *out, TesselPoint *Candidates[3]);
 
     // convex envelope
@@ -228 +215 @@
     bool InsertStraddlingPoints(ofstream *out, PointCloud *cloud, LinkedCell *LC);
     double RemovePointFromTesselatedSurface(ofstream *out, class BoundaryPointSet *point);
-    class BoundaryLineSet * FlipBaseline(ofstream *out, class BoundaryLineSet *Base);
-    double PickFarthestofTwoBaselines(ofstream *out, class BoundaryLineSet *Base);
+    bool FlipBaseline(ofstream *out, class BoundaryLineSet *Base);
+    bool PickFarthestofTwoBaselines(ofstream *out, class BoundaryLineSet *Base);
     class BoundaryPointSet *IsConvexRectangle(ofstream *out, class BoundaryLineSet *Base);
-    map<int, int> * FindAllDegeneratedTriangles();
-    map<int, int> * FindAllDegeneratedLines();
+    map<int, int> FindAllDegeneratedTriangles();
     void RemoveDegeneratedTriangles();
-    void AddBoundaryPointByDegeneratedTriangle(ofstream *out, class TesselPoint *point, LinkedCell *LC);
-
-    set<TesselPoint*> * GetAllConnectedPoints(ofstream *out, TesselPoint* Point);
-    set<BoundaryTriangleSet*> *GetAllTriangles(ofstream *out, class BoundaryPointSet *Point);
-    list<list<TesselPoint*> *> * GetPathsOfConnectedPoints(ofstream *out, TesselPoint* Point);
-    list<list<TesselPoint*> *> * GetClosedPathsOfConnectedPoints(ofstream *out, TesselPoint* Point);
-    list<TesselPoint*> * GetCircleOfConnectedPoints(ofstream *out, TesselPoint* Point, Vector *Reference = NULL);
+
+    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);
@@ -247 +229 @@
     bool IsInnerPoint(ofstream *out, TesselPoint *Point, LinkedCell* LC);
     bool AddBoundaryPoint(TesselPoint *Walker, int n);
-
-    // print for debugging
-    void PrintAllBoundaryPoints(ofstream *out);
-    void PrintAllBoundaryLines(ofstream *out);
-    void PrintAllBoundaryTriangles(ofstream *out);
-
-    // store envelope in file
-    void Output(ofstream *out, const char *filename, PointCloud *cloud);
 
     PointMap PointsOnBoundary;
@@ -277 +251 @@
     class BoundaryLineSet *BLS[3];
     class BoundaryTriangleSet *BTS;
-    class BoundaryTriangleSet *LastTriangle;
-    int TriangleFilesWritten;
 
   private:
@@ -286 +258 @@
 };
 
+bool CheckLineCriteriaForDegeneratedTriangle(class BoundaryPointSet *nodes[3]);
+bool SortCandidates(class CandidateForTesselation* candidate1, class CandidateForTesselation* candidate2);
+TesselPoint* FindClosestPoint(const Vector* Point, TesselPoint *&SecondPoint, LinkedCell* LC);
+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_ */