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

make TAnimModel possible to delete

Browse Source
This commit is contained in:
milek7
2019-02-23 14:44:21 +01:00
parent 5fe4e1213e
commit cbb61ce639
7 changed files with 69 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Event.cpp
View File

@@ -1291,8 +1291,8 @@ animation_event::init() {
for( auto &target : m_targets ) {
auto *targetmodel { static_cast<TAnimModel *>( std::get<scene::basic_node *>( target ) ) };
if( targetmodel == nullptr ) { continue; }
auto *targetcontainer{ targetmodel->GetContainer( m_animationsubmodel ) };
if( targetcontainer == nullptr ) {
auto targetcontainer{ targetmodel->GetContainer( m_animationsubmodel ) };
if( !targetcontainer ) {
m_ignored = true;
ErrorLog( "Bad event: \"" + m_name + "\" (type: " + type() + ") can't find submodel " + m_animationsubmodel + " in model instance \"" + targetmodel->name() + "\"" );
break;
@@ -1399,7 +1399,12 @@ animation_event::run_() {
WriteLog( "Type: Animation" );
// animation modes target specific submodels
for( auto *targetcontainer : m_animationcontainers ) {
m_animationcontainers.remove_if([this](std::weak_ptr<TAnimContainer> ptr)
{
auto targetcontainer = ptr.lock();
if (!targetcontainer)
return true;
switch( m_animationtype ) {
case 1: { // rotate
targetcontainer->SetRotateAnim(
@@ -1418,7 +1423,8 @@ animation_event::run_() {
break;
}
}
}
return false;
});
}
// export_as_text() subclass details