quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use original brush for CSG_DeleteComponents result and try to for CSG_WrapMerge to preserve selection on undo

Browse Source
This commit is contained in:
Garux 2018-11-24 01:49:58 +03:00
parent adc6adf50e
commit 058ae2697e
1 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
radiant/csg.cpp
View File

@ -456,7 +456,8 @@ void post( const scene::Path& path, scene::Instance& instance ) const {
Brush* brush = Node_getBrush( path.top() ); Brush* brush = Node_getBrush( path.top() );
if ( brush != 0 if ( brush != 0
&& Instance_getSelectable( instance )->isSelected() && Instance_getSelectable( instance )->isSelected()
&& path.size() > 1 ) { && path.size() > 1
&& path.top().get_pointer() != m_keepNode ) {
scene::Node& parent = path.parent(); scene::Node& parent = path.parent();
Path_deleteTop( path ); Path_deleteTop( path );
if( Node_getTraversable( parent )->empty() ){ if( Node_getTraversable( parent )->empty() ){
@ -1136,16 +1137,16 @@ void CSG_build_hull( const MergeVertices& mergeVertices, MergePlanes& mergePlane
} }
void CSG_WrapMerge( const ClipperPoints& clipperPoints ){ void CSG_WrapMerge( const ClipperPoints& clipperPoints ){
const bool primit = ( GlobalSelectionSystem().Mode() == SelectionSystem::ePrimitive );
brush_vector_t selected_brushes;
if( primit )
GlobalSceneGraph().traverse( BrushGatherSelected( selected_brushes ) );
if ( !GlobalSelectionSystem().countSelected() && !GlobalSelectionSystem().countSelectedComponents() ) { if ( !GlobalSelectionSystem().countSelected() && !GlobalSelectionSystem().countSelectedComponents() ) {
globalWarningStream() << "CSG Wrap Merge: No brushes or components selected.\n"; globalWarningStream() << "CSG Wrap Merge: No brushes or components selected.\n";
return; return;
} }
const bool primit = ( GlobalSelectionSystem().Mode() == SelectionSystem::ePrimitive );
brush_vector_t selected_brushes;
if( primit )
GlobalSceneGraph().traverse( BrushGatherSelected( selected_brushes ) );
MergeVertices mergeVertices; MergeVertices mergeVertices;
/* gather unique vertices */ /* gather unique vertices */
for ( brush_vector_t::const_iterator b = selected_brushes.begin(); b != selected_brushes.end(); ++b ) for ( brush_vector_t::const_iterator b = selected_brushes.begin(); b != selected_brushes.end(); ++b )
@ -1188,7 +1189,13 @@ void CSG_WrapMerge( const ClipperPoints& clipperPoints ){
} }
NodeSmartReference node( ( new BrushNode() )->node() ); NodeSmartReference node( ( new BrushNode() )->node() );
Brush* brush = Node_getBrush( node ); Brush* brush = GlobalSelectionSystem().countSelected() > 0? Node_getBrush( GlobalSelectionSystem().ultimateSelected().path().top() ) : 0;
const bool oldbrush = brush && primit;
if( oldbrush )
brush->clear();
else{
brush = Node_getBrush( node );
}
{ {
const char* shader = TextureBrowser_GetSelectedShader(); const char* shader = TextureBrowser_GetSelectedShader();
@ -1210,16 +1217,21 @@ void CSG_WrapMerge( const ClipperPoints& clipperPoints ){
} }
else else
{ {
scene::Path path = ultimate_group_path(); if( oldbrush ){
GlobalSceneGraph().traverse( BrushDeleteSelected( GlobalSelectionSystem().ultimateSelected().path().top().get_pointer() ) );
}
else{
scene::Path path = ultimate_group_path();
// free the original brushes // free the original brushes
if( primit ) if( primit )
GlobalSceneGraph().traverse( BrushDeleteSelected( path.top().get_pointer() ) ); GlobalSceneGraph().traverse( BrushDeleteSelected( path.top().get_pointer() ) );
Node_getTraversable( path.top() )->insert( node ); Node_getTraversable( path.top() )->insert( node );
path.push( makeReference( node.get() ) ); path.push( makeReference( node.get() ) );
selectPath( path, true ); selectPath( path, true );
}
} }
} }
@ -1287,17 +1299,17 @@ void CSG_DeleteComponents(){
return; return;
} }
NodeSmartReference node( ( new BrushNode() )->node() );
brush = Node_getBrush( node );
{ {
ComponentSelectionTestable* componentSelectionTestable = Instance_getComponentSelectionTestable( *instance );
componentSelectionTestable->setSelectedComponents( false, SelectionSystem::eVertex );
componentSelectionTestable->setSelectedComponents( false, SelectionSystem::eEdge );
componentSelectionTestable->setSelectedComponents( false, SelectionSystem::eFace );
const char* shader = TextureBrowser_GetSelectedShader(); const char* shader = TextureBrowser_GetSelectedShader();
TextureProjection projection; TextureProjection projection;
TexDef_Construct_Default( projection ); TexDef_Construct_Default( projection );
for( MergePlanes::const_iterator i = mergePlanes.begin(); i != mergePlanes.end(); ++i ){ for( MergePlanes::const_iterator i = mergePlanes.begin(); i != mergePlanes.end(); ++i ){
if( i->m_face ) if( !i->m_face )
brush->addFace( *( i->m_face ) );
else
brush->addPlane( i->m_v1, i->m_v2, i->m_v3, shader, projection ); brush->addPlane( i->m_v1, i->m_v2, i->m_v3, shader, projection );
} }
brush->removeEmptyFaces(); brush->removeEmptyFaces();
@ -1307,19 +1319,6 @@ void CSG_DeleteComponents(){
if ( !brush->hasContributingFaces() ) { if ( !brush->hasContributingFaces() ) {
globalWarningStream() << "CSG_DeleteComponents: Failed - result would not be convex.\n"; globalWarningStream() << "CSG_DeleteComponents: Failed - result would not be convex.\n";
} }
else
{
scene::Path path = instance->path();
path.pop();
Node_getTraversable( path.top() )->insert( node );
path.push( makeReference( node.get() ) );
selectPath( path, true ); //b4 original deletion, so component mode will stay enabled
// free the original brush
Path_deleteTop( instance->path() );
}
} }
} }