Commit 180d2beb authored by David Bommes's avatar David Bommes
Browse files

added UPDATE_SELECTION_HALFEDGES

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@9990 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 27329c95
...@@ -62,7 +62,7 @@ bool UpdateType::contains( const UpdateType& _type ) const { ...@@ -62,7 +62,7 @@ bool UpdateType::contains( const UpdateType& _type ) const {
// Catch the specialization of updates // Catch the specialization of updates
if ( _type == UPDATE_SELECTION ) { if ( _type == UPDATE_SELECTION ) {
// if ( type_ == UPDATE_SELECTION_VERTICES.type_ || type_ == UPDATE_SELECTION_EDGES.type_ || type_ == UPDATE_SELECTION_FACES.type_ ) // if ( type_ == UPDATE_SELECTION_VERTICES.type_ || type_ == UPDATE_SELECTION_EDGES.type_ || type_ == UPDATE_SELECTION_FACES.type_ )
if ( type_ == UPDATE_SELECTION_VERTICES.type_ || type_ == UPDATE_SELECTION_EDGES.type_ || type_ == UPDATE_SELECTION_FACES.type_ || type_ == UPDATE_SELECTION_KNOTS.type_ ) if ( type_ == UPDATE_SELECTION_VERTICES.type_ || type_ == UPDATE_SELECTION_EDGES.type_ || type_ == UPDATE_SELECTION_HALFEDGES.type_ || type_ == UPDATE_SELECTION_FACES.type_ || type_ == UPDATE_SELECTION_KNOTS.type_ )
return true; return true;
} }
...@@ -140,6 +140,10 @@ void initializeUpdateTypes() { ...@@ -140,6 +140,10 @@ void initializeUpdateTypes() {
updateTypeToTypeInfo[UPDATE_SELECTION_EDGES] = updateTypes.size(); updateTypeToTypeInfo[UPDATE_SELECTION_EDGES] = updateTypes.size();
updateTypes.push_back( UpdateTypeInfo(UPDATE_SELECTION_EDGES, "EdgeSelection", true) ); updateTypes.push_back( UpdateTypeInfo(UPDATE_SELECTION_EDGES, "EdgeSelection", true) );
stringToUpdateTypeInfo["HalfedgeSelection"] = updateTypes.size();
updateTypeToTypeInfo[UPDATE_SELECTION_HALFEDGES] = updateTypes.size();
updateTypes.push_back( UpdateTypeInfo(UPDATE_SELECTION_HALFEDGES, "HalfedgeSelection", true) );
stringToUpdateTypeInfo["FaceSelection"] = updateTypes.size(); stringToUpdateTypeInfo["FaceSelection"] = updateTypes.size();
updateTypeToTypeInfo[UPDATE_SELECTION_FACES] = updateTypes.size(); updateTypeToTypeInfo[UPDATE_SELECTION_FACES] = updateTypes.size();
updateTypes.push_back( UpdateTypeInfo(UPDATE_SELECTION_FACES, "FaceSelection", true) ); updateTypes.push_back( UpdateTypeInfo(UPDATE_SELECTION_FACES, "FaceSelection", true) );
...@@ -159,6 +163,7 @@ void initializeUpdateTypes() { ...@@ -159,6 +163,7 @@ void initializeUpdateTypes() {
updateTypeToString[UPDATE_SELECTION] = "Selection"; updateTypeToString[UPDATE_SELECTION] = "Selection";
updateTypeToString[UPDATE_SELECTION_VERTICES] = "VertexSelection"; updateTypeToString[UPDATE_SELECTION_VERTICES] = "VertexSelection";
updateTypeToString[UPDATE_SELECTION_EDGES] = "EdgeSelection"; updateTypeToString[UPDATE_SELECTION_EDGES] = "EdgeSelection";
updateTypeToString[UPDATE_SELECTION_HALFEDGES]= "HalfedgeSelection";
updateTypeToString[UPDATE_SELECTION_FACES] = "FaceSelection"; updateTypeToString[UPDATE_SELECTION_FACES] = "FaceSelection";
updateTypeToString[UPDATE_SELECTION_KNOTS] = "KnotSelection"; updateTypeToString[UPDATE_SELECTION_KNOTS] = "KnotSelection";
updateTypeToString[UPDATE_COLOR] = "Color"; updateTypeToString[UPDATE_COLOR] = "Color";
......
...@@ -76,26 +76,33 @@ const UpdateType UPDATE_SELECTION_VERTICES( UpdateTypeSet(1) << 5 ); ...@@ -76,26 +76,33 @@ const UpdateType UPDATE_SELECTION_VERTICES( UpdateTypeSet(1) << 5 );
*/ */
const UpdateType UPDATE_SELECTION_EDGES( UpdateTypeSet(1) << 6 ); const UpdateType UPDATE_SELECTION_EDGES( UpdateTypeSet(1) << 6 );
/** \brief Edge selection has changed
*
* This is a more fine grained selection update. UPDATE_SELECTION will also match this update type.
*/
const UpdateType UPDATE_SELECTION_HALFEDGES( UpdateTypeSet(1) << 7 );
/** \brief Face selection has changed /** \brief Face selection has changed
* *
* This is a more fine grained selection update. UPDATE_SELECTION will also match this update type. * This is a more fine grained selection update. UPDATE_SELECTION will also match this update type.
*/ */
const UpdateType UPDATE_SELECTION_FACES( UpdateTypeSet(1) << 7 ); const UpdateType UPDATE_SELECTION_FACES( UpdateTypeSet(1) << 8 );
/** \brief Knot selection has changed /** \brief Knot selection has changed
* *
* This is a more fine grained selection update. UPDATE_SELECTION will also match this update type. * This is a more fine grained selection update. UPDATE_SELECTION will also match this update type.
*/ */
const UpdateType UPDATE_SELECTION_KNOTS( UpdateTypeSet(1) << 8 ); const UpdateType UPDATE_SELECTION_KNOTS( UpdateTypeSet(1) << 9 );
/** \brief Colors have changed /** \brief Colors have changed
* *
* Update the colors. This does not have to be called when topology is also updated * Update the colors. This does not have to be called when topology is also updated
*/ */
const UpdateType UPDATE_COLOR( UpdateTypeSet(1) << 9 ); const UpdateType UPDATE_COLOR( UpdateTypeSet(1) << 10 );
/// marks the last used ID /// marks the last used ID
const UpdateType UPDATE_UNUSED ( UpdateTypeSet(1) << 10 ); const UpdateType UPDATE_UNUSED ( UpdateTypeSet(1) << 11 );
//===================================================================================== //=====================================================================================
// FUNCTIONS // FUNCTIONS
......
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