28: MarkEdgeSideOfTriangle

Author: prepare

Poly2Tri.csproj

@@ -73,7 +73,7 @@
  <Compile Include="Triangulation\Sets\PointSet.cs" />
  <Compile Include="Triangulation\ITriangulatable.cs" />
  <Compile Include="Triangulation\TriangulationAlgorithm.cs" />
- <Compile Include="Triangulation\TriangulationConstraint.cs" />
+ <Compile Include="x_notused\TriangulationConstraint.cs" />
  <Compile Include="Triangulation\TriangulationContext.cs" />
  <Compile Include="Triangulation\TriangulationDebugContext.cs" />
  <Compile Include="Triangulation\TriangulationMode.cs" />

Triangulation/Delaunay/DelaunayTriangle.cs

@@ -194,9 +194,12 @@ public void MarkEdgeConstraint(int index, bool value)
  case 1:
  this.C1 = value;
  break;
- default:
+ case 2:
  this.C2 = value;
  break;
+ default:
+ //may be -1
+ break;
  }
  }
  public void ClearAllEdgeDelaunayMarks()
@@ -508,10 +511,7 @@ public void MarkEdge(List<DelaunayTriangle> tList)
  }
  }
  }
- public void MarkConstrainedEdge(int index)
- {
- MarkEdgeConstraint(index, true);
- }
+
 
  public void SelectAndMarkConstrainedEdge(DTSweepConstraint edge)
  {
@@ -522,13 +522,9 @@ public void SelectAndMarkConstrainedEdge(DTSweepConstraint edge)
  /// Mark edge as constrained
  /// </summary>
  public void SelectAndMarkConstrainedEdge(TriangulationPoint p, TriangulationPoint q)
- {
- int i = EdgeIndex(p, q);
- if (i != -1)
- {
- //MarkConstrainedEdge(i, true);
- MarkEdgeConstraint(i, true);
- }
+ { 
+ MarkEdgeConstraint(EdgeIndex(p, q), true);
+
  }
 
  public double Area()
@@ -552,7 +548,7 @@ public TriangulationPoint Centroid()
  /// <returns>index of the shared edge or -1 if edge isn't shared</returns>
  public int EdgeIndex(TriangulationPoint p1, TriangulationPoint p2)
  {
- int i1 = InternalIndexOf(p1);// Points.IndexOf(p1);
+ int i1 = InternalIndexOf(p1); 
  int i2 = InternalIndexOf(p2);
 
  // Points of this triangle in the edge p1-p2

Triangulation/Delaunay/Sweep/DTSweep.cs

@@ -110,17 +110,41 @@ private static void Sweep(DTSweepContext tcx)
 
  node = PointEvent(tcx, point);
 
- if (point.HasEdges)
+ var internalEdgeList = point.GetInternalEdgeList();
+
+ if (internalEdgeList != null)
  {
- foreach (DTSweepConstraint e in point.GetEdgeIter())
+ int j = internalEdgeList.Count;
+
+ if (tcx.IsDebugEnabled)
  {
- if (tcx.IsDebugEnabled)
+ for (int m = 0; m < j; ++m)
  {
+ var e = internalEdgeList[m];
  tcx.DTDebugContext.ActiveConstraint = e;
+ EdgeEvent(tcx, e, node);
+ }
+ }
+ else
+ {
+ for (int m = 0; m < j; ++m)
+ {
+ EdgeEvent(tcx, internalEdgeList[m], node);
  }
- EdgeEvent(tcx, e, node);
  }
  }
+
+ //if (point.HasEdges)
+ //{ 
+ // foreach (DTSweepConstraint e in point.GetEdgeIter())
+ // {
+ // if (tcx.IsDebugEnabled)
+ // {
+ // tcx.DTDebugContext.ActiveConstraint = e;
+ // }
+ // EdgeEvent(tcx, e, node);
+ // }
+ //}
  tcx.Update(null);
  }
  }
@@ -296,7 +320,7 @@ private static void EdgeEvent(DTSweepContext tcx, DTSweepConstraint edge, Advanc
 
  if (tcx.IsDebugEnabled) { tcx.DTDebugContext.PrimaryTriangle = node.Triangle; }
 
- if (IsEdgeSideOfTriangle(node.Triangle, edge.P, edge.Q)) return;
+ if (MarkEdgeSideOfTriangle(node.Triangle, edge.P, edge.Q)) return;
 
  // For now we will do all needed filling
  // TODO: integrate with flip process might give some better performance 
@@ -312,7 +336,7 @@ private static void EdgeEvent(DTSweepContext tcx, DTSweepConstraint edge, Advanc
  }
  }
 
- private static void FillEdgeEvent(DTSweepContext tcx, DTSweepConstraint edge, AdvancingFrontNode node)
+ static void FillEdgeEvent(DTSweepContext tcx, DTSweepConstraint edge, AdvancingFrontNode node)
  {
  if (tcx.EdgeEvent.Right)
  {
@@ -324,7 +348,7 @@ private static void FillEdgeEvent(DTSweepContext tcx, DTSweepConstraint edge, Ad
  }
  }
 
- private static void FillRightConcaveEdgeEvent(DTSweepContext tcx, DTSweepConstraint edge, AdvancingFrontNode node)
+ static void FillRightConcaveEdgeEvent(DTSweepContext tcx, DTSweepConstraint edge, AdvancingFrontNode node)
  {
  Fill(tcx, node.Next);
  if (node.Next.Point != edge.P)
@@ -397,7 +421,7 @@ private static void FillRightAboveEdgeEvent(DTSweepContext tcx, DTSweepConstrain
  while (node.Next.Point.X < edge.P.X)
  {
  if (tcx.IsDebugEnabled) { tcx.DTDebugContext.ActiveNode = node; }
- // Check if next node is below the edge
+
  Orientation o1 = TriangulationUtil.Orient2d(edge.Q, node.Next.Point, edge.P);
  if (o1 == Orientation.CCW)
  {
@@ -496,32 +520,37 @@ private static void FillLeftAboveEdgeEvent(DTSweepContext tcx, DTSweepConstraint
  }
  }
 
- private static bool IsEdgeSideOfTriangle(DelaunayTriangle triangle, TriangulationPoint ep, TriangulationPoint eq)
+
+ private static bool MarkEdgeSideOfTriangle(DelaunayTriangle triangle, TriangulationPoint ep, TriangulationPoint eq)
  {
- int index = triangle.EdgeIndex(ep, eq);
- if (index == -1)
- {
- return false;
- }
- triangle.MarkConstrainedEdge(index);
- switch (index)
+ switch (triangle.EdgeIndex(ep, eq))
  {
+
  case 0:
- {
- triangle = triangle.N0;
- } break;
+ { //mark constraint
+ triangle.C0 = true;
+ //change triangle here
+ if ((triangle = triangle.N0) != null) { triangle.SelectAndMarkConstrainedEdge(ep, eq); }
+ return true;
+ }
  case 1:
  {
- triangle = triangle.N1;
- } break;
- default:
+ triangle.C1 = true;
+ //change triangle here
+ if ((triangle = triangle.N1) != null) { triangle.SelectAndMarkConstrainedEdge(ep, eq); }
+ return true;
+ }
+ case 2:
  {
- triangle = triangle.N2;
- } break;
- }
-
- if (triangle != null) triangle.SelectAndMarkConstrainedEdge(ep, eq);
- return true;
+ triangle.C2 = true;
+ //change triangle here
+ if ((triangle = triangle.N2) != null) { triangle.SelectAndMarkConstrainedEdge(ep, eq); }
+ return true;
+ }
+ default:
+ //may be -1 
+ return false;
+ } 
  }
 
  private static void EdgeEvent(DTSweepContext tcx, TriangulationPoint ep, TriangulationPoint eq, DelaunayTriangle triangle, TriangulationPoint point)
@@ -530,7 +559,7 @@ private static void EdgeEvent(DTSweepContext tcx, TriangulationPoint ep, Triangu
 
  if (tcx.IsDebugEnabled) tcx.DTDebugContext.PrimaryTriangle = triangle;
 
- if (IsEdgeSideOfTriangle(triangle, ep, eq)) return;
+ if (MarkEdgeSideOfTriangle(triangle, ep, eq)) return;
 
  p1 = triangle.PointCCWFrom(point);
  Orientation o1 = TriangulationUtil.Orient2d(eq, p1, ep);
@@ -575,7 +604,7 @@ private static void EdgeEvent(DTSweepContext tcx, TriangulationPoint ep, Triangu
  FlipEdgeEvent(tcx, ep, eq, triangle, point);
  }
  }
- 
+
  /// <summary>
  /// In the case of a pointset with some constraint edges. If a triangle side is collinear
  /// with a part of the constraint we split the constraint into two constraints. This could

Triangulation/Delaunay/Sweep/DTSweepContext.cs

@@ -62,21 +62,21 @@ public class DTSweepContext : TriangulationContext
  public DTSweepContext()
  { 
  } 
- public override bool IsDebugEnabled
- {
- get
- {
- return base.IsDebugEnabled;
- }
- protected set
- {
- if (value && DebugContext == null)
- {
- DebugContext = new DTSweepDebugContext(this);
- }
- base.IsDebugEnabled = value;
- }
- }
+ //public   bool IsDebugEnabled
+ //{
+ // get
+ // {
+ // return base.IsDebugEnabled;
+ // }
+ // //protected set
+ // //{
+ // // if (value && DebugContext == null)
+ // // {
+ // // DebugContext = new DTSweepDebugContext(this);
+ // // }
+ // // base.IsDebugEnabled = value;
+ // //}
+ //}
 
  public void RemoveFromList(DelaunayTriangle triangle)
  {

Triangulation/TriangulationContext.cs

@@ -38,7 +38,7 @@ public abstract class TriangulationContext
  {
 
  public readonly List<DelaunayTriangle> Triangles = new List<DelaunayTriangle>();
- public readonly List<TriangulationPoint> Points = new List<TriangulationPoint>(200); 
+ public readonly List<TriangulationPoint> Points = new List<TriangulationPoint>(200);
  internal TriangulationContext()
  {
  }
@@ -70,7 +70,12 @@ public virtual void Clear()
 #endif
  }
 
- public virtual bool IsDebugEnabled { get; protected set; }
+ public bool IsDebugEnabled { get; private set; }
+
+ protected void SetDebugMode(bool enable)
+ {
+ this.IsDebugEnabled = enable;
+ }
 
  public DTSweepDebugContext DTDebugContext { get { return DebugContext as DTSweepDebugContext; } }
 

Triangulation/TriangulationDebugContext.cs

@@ -33,8 +33,7 @@ namespace Poly2Tri
 {
  public abstract class TriangulationDebugContext
  {
- protected TriangulationContext _tcx;
-
+ protected TriangulationContext _tcx; 
  public TriangulationDebugContext(TriangulationContext tcx)
  {
  _tcx = tcx;

Triangulation/TriangulationMode.cs

@@ -27,10 +27,14 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-namespace Poly2Tri {
-public enum TriangulationMode {
-Unconstrained,Constrained,Polygon
-}
-}
+ */
+
+namespace Poly2Tri
+{
+ public enum TriangulationMode
+ {
+ Unconstrained,
+ Constrained,
+ Polygon
+ }
+}

Triangulation/TriangulationPoint.cs

@@ -64,17 +64,21 @@ public void AddEdge(DTSweepConstraint e)
  myEdges = new List<DTSweepConstraint>();
  }
  myEdges.Add(e);
- } 
- public IEnumerable<DTSweepConstraint> GetEdgeIter()
+ }
+ //public IEnumerable<DTSweepConstraint> GetEdgeIter()
+ //{
+ // List<DTSweepConstraint> edges = this.myEdges;
+ // if (edges != null)
+ // {
+ // foreach (var e in edges)
+ // {
+ // yield return e;
+ // }
+ // }
+ //}
+ internal List<DTSweepConstraint> GetInternalEdgeList()
  {
- List<DTSweepConstraint> edges = this.myEdges;
- if (edges != null)
- {
- foreach (var e in edges)
- {
- yield return e;
- }
- }
+ return this.myEdges;
  }
  public bool HasEdges { get { return myEdges != null; } }
 

x_notused/TriangulationConstraint.cs

@@ -0,0 +1,44 @@
+///* Poly2Tri
+// * Copyright (c) 2009-2010, Poly2Tri Contributors
+// * http://code.google.com/p/poly2tri/
+// *
+// * All rights reserved.
+// *
+// * Redistribution and use in source and binary forms, with or without modification,
+// * are permitted provided that the following conditions are met:
+// *
+// * * Redistributions of source code must retain the above copyright notice,
+// * this list of conditions and the following disclaimer.
+// * * Redistributions in binary form must reproduce the above copyright notice,
+// * this list of conditions and the following disclaimer in the documentation
+// * and/or other materials provided with the distribution.
+// * * Neither the name of Poly2Tri nor the names of its contributors may be
+// * used to endorse or promote products derived from this software without specific
+// * prior written permission.
+// *
+// * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+// * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+// * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// */
+///**
+// * Forces a triangle edge between two points p and q
+// * when triangulating. For example used to enforce
+// * Polygon Edges during a polygon triangulation.
+// * 
+// * @author Thomas Åhlén, thahlen@gmail.com
+// */
+
+//namespace Poly2Tri {
+// public class TriangulationConstraint {
+// public TriangulationPoint P;
+// public TriangulationPoint Q;
+// }
+//}