Commit b1e33042 authored by Kenneth Vanhoey's avatar Kenneth Vanhoey
Browse files

Merge with luntereiner

parent 333cfee2
...@@ -453,6 +453,8 @@ public: ...@@ -453,6 +453,8 @@ public:
bool nextEdge(Dart& d) ; bool nextEdge(Dart& d) ;
void updateBeforeCollapse(Dart d) ; void updateBeforeCollapse(Dart d) ;
void updateAfterCollapse(Dart d2, Dart dd2) ; void updateAfterCollapse(Dart d2, Dart dd2) ;
void updateWithoutCollapse() { }
} ; } ;
/***************************************************************************************************************** /*****************************************************************************************************************
...@@ -514,6 +516,8 @@ public: ...@@ -514,6 +516,8 @@ public:
bool nextEdge(Dart& d) ; bool nextEdge(Dart& d) ;
void updateBeforeCollapse(Dart d) ; void updateBeforeCollapse(Dart d) ;
void updateAfterCollapse(Dart d2, Dart dd2) ; void updateAfterCollapse(Dart d2, Dart dd2) ;
void updateWithoutCollapse() { }
} ; } ;
/***************************************************************************************************************** /*****************************************************************************************************************
...@@ -580,6 +584,8 @@ public: ...@@ -580,6 +584,8 @@ public:
bool nextEdge(Dart& d) ; bool nextEdge(Dart& d) ;
void updateBeforeCollapse(Dart d) ; void updateBeforeCollapse(Dart d) ;
void updateAfterCollapse(Dart d2, Dart dd2) ; void updateAfterCollapse(Dart d2, Dart dd2) ;
void updateWithoutCollapse() { }
} ; } ;
} // namespace Decimation } // namespace Decimation
......
...@@ -87,6 +87,8 @@ public: ...@@ -87,6 +87,8 @@ public:
bool nextEdge(Dart& d) ; bool nextEdge(Dart& d) ;
void updateBeforeCollapse(Dart d) ; void updateBeforeCollapse(Dart d) ;
void updateAfterCollapse(Dart d2, Dart dd2) ; void updateAfterCollapse(Dart d2, Dart dd2) ;
void updateWithoutCollapse() { }
} ; } ;
///***************************************************************************************************************** ///*****************************************************************************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment