Commit 65a0b509 authored by Ellen Dekkers's avatar Ellen Dekkers

Update Type for Knot Selection added

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@9588 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 6a50f600
......@@ -61,7 +61,8 @@ bool UpdateType::contains( const UpdateType& _type ) const {
// Catch the specialization of updates
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_ )
return true;
}
......@@ -143,6 +144,10 @@ void initializeUpdateTypes() {
updateTypeToTypeInfo[UPDATE_SELECTION_FACES] = updateTypes.size();
updateTypes.push_back( UpdateTypeInfo(UPDATE_SELECTION_FACES, "FaceSelection", true) );
stringToUpdateTypeInfo["KnotSelection"] = updateTypes.size();
updateTypeToTypeInfo[UPDATE_SELECTION_KNOTS] = updateTypes.size();
updateTypes.push_back( UpdateTypeInfo(UPDATE_SELECTION_KNOTS, "KnotSelection", true) );
stringToUpdateTypeInfo["Color"] = updateTypes.size();
updateTypeToTypeInfo[UPDATE_COLOR] = updateTypes.size();
updateTypes.push_back( UpdateTypeInfo(UPDATE_COLOR, "Color", true) );
......@@ -155,6 +160,7 @@ void initializeUpdateTypes() {
updateTypeToString[UPDATE_SELECTION_VERTICES] = "VertexSelection";
updateTypeToString[UPDATE_SELECTION_EDGES] = "EdgeSelection";
updateTypeToString[UPDATE_SELECTION_FACES] = "FaceSelection";
updateTypeToString[UPDATE_SELECTION_KNOTS] = "KnotSelection";
updateTypeToString[UPDATE_COLOR] = "Color";
}
......
......@@ -82,14 +82,20 @@ const UpdateType UPDATE_SELECTION_EDGES( UpdateTypeSet(1) << 6 );
*/
const UpdateType UPDATE_SELECTION_FACES( UpdateTypeSet(1) << 7 );
/** \brief Knot selection has changed
*
* This is a more fine grained selection update. UPDATE_SELECTION will also match this update type.
*/
const UpdateType UPDATE_SELECTION_KNOTS( UpdateTypeSet(1) << 8 );
/** \brief Colors have changed
*
* Update the colors. This does not have to be called when topology is also updated
*/
const UpdateType UPDATE_COLOR( UpdateTypeSet(1) << 8 );
const UpdateType UPDATE_COLOR( UpdateTypeSet(1) << 9 );
/// marks the last used ID
const UpdateType UPDATE_UNUSED ( UpdateTypeSet(1) << 9 );
const UpdateType UPDATE_UNUSED ( UpdateTypeSet(1) << 10 );
//=====================================================================================
// 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