Changeset a732ff for molecuilder/src/tesselation.hpp

Timestamp:

Apr 12, 2010, 4:44:29 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

4283d0

Parents:

41c00d

git-author:

Frederik Heber <heber@…> (04/12/10 16:35:12)

git-committer:

Frederik Heber <heber@…> (04/12/10 16:44:29)

Message:

Changes to BoundaryTriangleSet and CandidateForTesselation.

• BoundaryTriangleSet:
  • new member variable top which references the triangle we have been "tesselated from"
  • new member variable AngleFromTop which stores the angle that was used during tesselation from top
  • new member function SetTopNode()
  • Tesselation::AddCandidateTriangle() sets top and AngleFromTop

• CandidateForTesselation:
  • new member ThirdPoint contains third point of triangle whose baseline is the base line
  • new member T which contains the whole triangle
  • constructor receives this third point additionally
  • destructor does not set Baseline to NULL (due to being const)
  • BUGFIX: CheckValidity() checks only OptCenter, other is not valid anyway!, did not went through pointlist at all (begin, begin), some verbosity changes, added animate_sphere script call
  • Tesselation::FindThirdPointForTesselation() sets ThirdPoint
  • Tesselation::FindNextSuitableTriangle() sets T

• BUGFIX: Tesselation::FindThirdPointForTesselation() clear CandidateLine.pointlist, which seemed to have contained old candidates from old runs.
• Tesselation::FindNextSuitableTriangle(): tesselPoint ThirdNode is now a BoundaryPointSet ThirdPoint (which has a name!)

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

File:

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

molecuilder/src/tesselation.hpp

@@ -42 +42 @@
 
 #define DoTecplotOutput 1
-#define DoRaster3DOutput 0
+#define DoRaster3DOutput 1
 #define DoVRMLOutput 0
 #define TecplotSuffix ".dat"
@@ -163 +163 @@
     bool IsPresentTupel(const BoundaryPointSet * const Points[3]) const;
     bool IsPresentTupel(const BoundaryTriangleSet * const T) const;
+    void SetTopNode(const BoundaryTriangleSet * const topnode);
 
     class BoundaryPointSet *endpoints[3];
     class BoundaryLineSet *lines[3];
+    const BoundaryTriangleSet *top; //!< triangle was instantiated during tesselation from this triangle
+    double AngleFromTop;
     Vector NormalVector;
     Vector SphereCenter;
@@ -249 +252 @@
   public :
   CandidateForTesselation(BoundaryLineSet* currentBaseLine);
-  CandidateForTesselation(TesselPoint* candidate, BoundaryLineSet* currentBaseLine, Vector OptCandidateCenter, Vector OtherOptCandidateCenter);
+  CandidateForTesselation(TesselPoint* candidate, BoundaryLineSet* currentBaseLine, BoundaryPointSet *point, Vector OptCandidateCenter, Vector OtherOptCandidateCenter);
   ~CandidateForTesselation();
 
@@ -255 +258 @@
 
   TesselPointList pointlist;
-  BoundaryLineSet *BaseLine;
+  const BoundaryLineSet * BaseLine;
+  const BoundaryPointSet * ThirdPoint;
+  const BoundaryTriangleSet *T;
+  Vector OldCenter;
   Vector OptCenter;
   Vector OtherOptCenter;
@@ -289 +295 @@
     void FindStartingTriangle(const double RADIUS, const LinkedCell *LC);
     void FindSecondPointForTesselation(class TesselPoint* a, Vector Oben, class TesselPoint*& OptCandidate, double Storage[3], double RADIUS, const LinkedCell *LC);
-    void FindThirdPointForTesselation(Vector &NormalVector, Vector &SearchDirection, Vector &OldSphereCenter, CandidateForTesselation &CandidateLine, const class TesselPoint  * const ThirdNode, const double RADIUS, const LinkedCell *LC) const;
+    void FindThirdPointForTesselation(Vector &NormalVector, Vector &SearchDirection, Vector &OldSphereCenter, CandidateForTesselation &CandidateLine, const class BoundaryPointSet  * const ThirdNode, const double RADIUS, const LinkedCell *LC) const;
     bool FindNextSuitableTriangle(CandidateForTesselation &CandidateLine, BoundaryTriangleSet &T, const double& RADIUS, const LinkedCell *LC);
     int CheckPresenceOfTriangle(class TesselPoint *Candidates[3]) const;