Skip to content

SurfaceManipulationWidget: simplify and fix face selection update on Patch #4746

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.

Sign up for GitHub

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

Merged
Fedr merged 1 commit into from
Jun 23, 2025
Merged

SurfaceManipulationWidget: simplify and fix face selection update on Patch #4746

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 9 additions & 20 deletions source/MRViewer/MRSurfaceManipulationWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,18 +378,16 @@ bool SurfaceManipulationWidget::onMouseUp_( Viewer::MouseButton button, int /*mo
expand( oldMesh.topology, visualizationRegion_, 2 );
updateUVmap_( false );
}
auto delFaces = getIncidentFaces( oldMesh.topology, generalEditingRegion_ );
const auto delFaces = getIncidentFaces( oldMesh.topology, generalEditingRegion_ );
if ( delFaces.any() )
{
SCOPED_HISTORY( "Brush: Patch" );
ownMeshChangedSignal_ = true;
std::shared_ptr<Mesh> newMesh = std::make_shared<Mesh>( oldMesh );
FaceBitSet faceSelection = obj_->getSelectedFaces() - delFaces;
UndirectedEdgeBitSet edgeSelection = obj_->getSelectedEdges() - getInnerEdges( oldMesh.topology, delFaces ); // must be done before actual deletion
FaceBitSet newFaceSelection = obj_->getSelectedFaces() - delFaces;
UndirectedEdgeBitSet newEdgeSelection = obj_->getSelectedEdges() - getInnerEdges( oldMesh.topology, delFaces ); // must be done before actual deletion
auto bds = delRegionKeepBd( *newMesh, delFaces );
const FaceBitSet oldFaces = newMesh->topology.getValidFaces();
FaceBitSet unchangeableFaces = getIncidentFaces( oldMesh.topology, unchangeableVerts_ );
FaceBitSet newFaceSelection;
for ( const auto & bd : bds )
{
if ( bd.empty() )
Expand All @@ -412,16 +410,10 @@ bool SurfaceManipulationWidget::onMouseUp_( Viewer::MouseButton button, int /*mo
{
settings.onEdgeSplit = [&] ( EdgeId e1, EdgeId e )
{
if ( unchangeableFaces.test( newMesh->topology.left( e ) ) )
{
if ( newFaceSelection.test( newMesh->topology.left( e ) ) )
newFaceSelection.autoResizeSet( newMesh->topology.left( e1 ) );
unchangeableFaces.autoResizeSet( newMesh->topology.left( e1 ) );
}
if ( unchangeableFaces.test( newMesh->topology.right( e ) ) )
{
if ( newFaceSelection.test( newMesh->topology.right( e ) ) )
newFaceSelection.autoResizeSet( newMesh->topology.right( e1 ) );
unchangeableFaces.autoResizeSet( newMesh->topology.right( e1 ) );
}
unchangeableVerts_.autoResizeSet( newMesh->topology.org( e ) );
};
}
Expand All @@ -430,13 +422,10 @@ bool SurfaceManipulationWidget::onMouseUp_( Viewer::MouseButton button, int /*mo
fillHoleNicely( *newMesh, e, settings );
}

if ( faceSelection.count() != obj_->getSelectedFaces().count() || newFaceSelection.any() )
{
faceSelection |= newFaceSelection;
AppendHistory<ChangeMeshFaceSelectionAction>( "Change Face Selection", obj_, std::move( faceSelection ) );
}
if ( edgeSelection.count() != obj_->getSelectedEdges().count() )
AppendHistory<ChangeMeshEdgeSelectionAction>( "Change Edge Selection", obj_, std::move( edgeSelection ) );
if ( newFaceSelection != obj_->getSelectedFaces() )
AppendHistory<ChangeMeshFaceSelectionAction>( "Change Face Selection", obj_, std::move( newFaceSelection ) );
if ( newEdgeSelection != obj_->getSelectedEdges() )
AppendHistory<ChangeMeshEdgeSelectionAction>( "Change Edge Selection", obj_, std::move( newEdgeSelection ) );

// newFaces include both faces inside the patch and subdivided faces around
const FaceBitSet newFaces = newMesh->topology.getValidFaces() - oldFaces;
Expand Down
Loading