-
Notifications
You must be signed in to change notification settings - Fork 133
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add callback functionality for vertex insertation, triangle add/change #179
Open
Madrich
wants to merge
2
commits into
artem-ogre:master
Choose a base branch
from
Madrich:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,11 +21,26 @@ | |
#include <string> | ||
#include <utility> | ||
#include <vector> | ||
#ifndef CDT_CALLBACK_DISABLED | ||
#include <functional> | ||
#endif | ||
|
||
/// Namespace containing triangulation functionality | ||
namespace CDT | ||
{ | ||
|
||
#ifndef CDT_CALLBACK_DISABLED | ||
/** | ||
* Types of callbacks to indicate what happened | ||
*/ | ||
enum CallbackType | ||
{ | ||
Unknown, | ||
Added, | ||
Changed, | ||
}; | ||
#endif | ||
|
||
/// @addtogroup API | ||
/// @{ | ||
|
||
|
@@ -451,7 +466,30 @@ class CDT_EXPORT Triangulation | |
* @return true if triangulation is finalized, false otherwise | ||
*/ | ||
bool isFinalized() const; | ||
|
||
#ifndef CDT_CALLBACK_DISABLED | ||
/** | ||
* Register a callback function for triangles has been created | ||
* currently one callback function is supported | ||
* Example using lambda function: | ||
* CDT::Triangulation<double> cdt = CDT::Triangulation<double> {}; | ||
* auto onTriCreated = [](CDT::TriInd ind, CDT::CallbackType type) -> void | ||
* { | ||
* std::cout << "Triangle created/changed with index " << ind << " and type"; | ||
* if (type == CDT::CallbackType::Added) | ||
* std::cout << "ADDED" << std::endl; | ||
* else if (type == CDT::CallbackType::Changed) | ||
* std::cout << "CHANGED" << std::endl; | ||
* }; | ||
* cdt.registerTriangleCallback(onTriCreated); | ||
*/ | ||
void registerTriangleCallback(std::function<void(TriInd, CallbackType)> fnc); | ||
|
||
/** | ||
* Register a callback function for vertexes has been inserted | ||
*/ | ||
void registerVertexCallback(std::function<void(VertInd, CallbackType)> fnc); | ||
#endif | ||
/** | ||
* Calculate depth of each triangle in constraint triangulation. Supports | ||
* overlapping boundaries. | ||
|
@@ -743,6 +781,12 @@ class CDT_EXPORT Triangulation | |
IntersectingConstraintEdges::Enum m_intersectingEdgesStrategy; | ||
T m_minDistToConstraintEdge; | ||
TriIndVec m_vertTris; /// one triangle adjacent to each vertex | ||
|
||
// C++11 required for std::fucntion callbacks | ||
#ifndef CDT_CALLBACK_DISABLED | ||
std::function<void(TriInd, CallbackType)> callback_tri; // callback function for triangle creation | ||
std::function<void(VertInd, CallbackType)> callback_vertex; // callback function for vertex insertation | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It seems Triangulation class members follow |
||
#endif | ||
}; | ||
|
||
/// @} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a typo in
triabngle