eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 06:59:18 +02:00
Code Issues 123 Wiki Activity

node delete in editor

Browse Source
This commit is contained in:
milek7
2019-02-23 15:35:23 +01:00
parent cbb61ce639
commit 37dc56a8d8
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Names.h
View File

@@ -62,6 +62,16 @@ public:
m_itemmap.erase(lookup); m_itemmap.erase(lookup);
} }
void purge (Type_ *Item)
{
for (auto it = m_items.begin(); it != m_items.end(); it++) {
if (*it == Item) {
delete *it;
*it = nullptr;
return;
}
}
}
// locates item with specified name. returns pointer to the item, or nullptr // locates item with specified name. returns pointer to the item, or nullptr
Type_ * Type_ *
find( std::string const &Name ) const { find( std::string const &Name ) const {

20
editormode.cpp
View File

@@ -180,6 +180,22 @@ editor_mode::on_key( int const Key, int const Scancode, int const Action, int co
break; break;
} }
case GLFW_KEY_DELETE: {
TAnimModel *model = dynamic_cast<TAnimModel*>(m_node);
if (!model)
break;
m_node = nullptr;
m_dragging = false;
Application.set_cursor( GLFW_CURSOR_NORMAL );
static_cast<editor_ui*>( m_userinterface.get() )->set_node(nullptr);
simulation::Region->erase(model);
simulation::Instances.purge(model);
break;
}
default: { default: {
break; break;
} }
@@ -231,13 +247,13 @@ editor_mode::on_mouse_button( int const Button, int const Action, int const Mods
if( Action == GLFW_PRESS ) { if( Action == GLFW_PRESS ) {
// left button press // left button press
auto const mode = dynamic_cast<editor_ui*>( m_userinterface.get() )->mode(); auto const mode = static_cast<editor_ui*>( m_userinterface.get() )->mode();
m_node = nullptr; m_node = nullptr;
GfxRenderer.pick_node([this, mode](scene::basic_node *node) GfxRenderer.pick_node([this, mode](scene::basic_node *node)
{ {
editor_ui *ui = dynamic_cast<editor_ui*>( m_userinterface.get() ); editor_ui *ui = static_cast<editor_ui*>( m_userinterface.get() );
if (mode == nodebank_panel::MODIFY) { if (mode == nodebank_panel::MODIFY) {
if (!m_dragging) if (!m_dragging)