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

* cloneSelected, cloneSelectedMakeUnique: select cloned stuff (was preserving original selected)

Browse Source 
important for cloneSelectedMakeUnique usability and when objects order in .map matters
This commit is contained in:
Garux 2021-11-24 23:49:46 +03:00
parent 1f7d0250b0
commit bf3f194cff
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/scenelib.h
View File

@ -823,7 +823,7 @@ inline void Scene_forEachChildSelectable( const Functor& functor, const scene::P
class SelectableSetSelected class SelectableSetSelected
{ {
bool m_selected; const bool m_selected;
public: public:
SelectableSetSelected( bool selected ) : m_selected( selected ){ SelectableSetSelected( bool selected ) : m_selected( selected ){
} }

42
radiant/mainframe.cpp
View File

@ -1263,6 +1263,7 @@ class CloneSelected : public scene::Graph::Walker
const bool m_makeUnique; const bool m_makeUnique;
const scene::Node* m_world; const scene::Node* m_world;
public: public:
mutable std::vector<scene::Node*> m_cloned;
CloneSelected( bool makeUnique ) : m_makeUnique( makeUnique ), m_world( Map_FindWorldspawn( g_map ) ){ CloneSelected( bool makeUnique ) : m_makeUnique( makeUnique ), m_world( Map_FindWorldspawn( g_map ) ){
} }
bool pre( const scene::Path& path, scene::Instance& instance ) const { bool pre( const scene::Path& path, scene::Instance& instance ) const {
@ -1278,10 +1279,7 @@ public:
if ( Instance_isSelected( instance ) ) { if ( Instance_isSelected( instance ) ) {
return false; return false;
} }
if( m_makeUnique && instance.childSelected() ){ /* clone group entity primitives to new group entity */ if( m_makeUnique && instance.childSelected() ){ /* clone selected group entity primitives to new group entity */
NodeSmartReference clone( Node_Clone_Selected( path.top() ) );
Map_gatherNamespaced( clone );
Node_getTraversable( path.parent().get() )->insert( clone );
return false; return false;
} }
} }
@ -1302,15 +1300,49 @@ public:
NodeSmartReference clone( Node_Clone( path.top() ) ); NodeSmartReference clone( Node_Clone( path.top() ) );
Map_gatherNamespaced( clone ); Map_gatherNamespaced( clone );
Node_getTraversable( path.parent().get() )->insert( clone ); Node_getTraversable( path.parent().get() )->insert( clone );
m_cloned.push_back( clone.get_pointer() );
}
else if( m_makeUnique && instance.childSelected() ){ /* clone selected group entity primitives to new group entity */
NodeSmartReference clone( Node_Clone_Selected( path.top() ) );
Map_gatherNamespaced( clone );
Node_getTraversable( path.parent().get() )->insert( clone );
m_cloned.push_back( clone.get_pointer() );
} }
} }
} }
}; };
void Scene_Clone_Selected( scene::Graph& graph, bool makeUnique ){ void Scene_Clone_Selected( scene::Graph& graph, bool makeUnique ){
graph.traverse( CloneSelected( makeUnique ) ); CloneSelected cloneSelected( makeUnique );
graph.traverse( cloneSelected );
Map_mergeClonedNames( makeUnique ); Map_mergeClonedNames( makeUnique );
/* deselect originals */
GlobalSelectionSystem().setSelectedAll( false );
/* select cloned */
for( scene::Node *node : cloneSelected.m_cloned )
{
class walker : public scene::Traversable::Walker
{
public:
bool pre( scene::Node& node ) const override {
if( scene::Instantiable *instantiable = Node_getInstantiable( node ) ){
class visitor : public scene::Instantiable::Visitor
{
public:
void visit( scene::Instance& instance ) const override {
Instance_setSelected( instance, true );
}
};
instantiable->forEachInstance( visitor() );
}
return true;
}
};
Node_traverseSubgraph( *node, walker() );
}
} }
enum ENudgeDirection enum ENudgeDirection