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

crosstrack search also for unordered entries

Browse Source
This commit is contained in:
milek7
2020-10-22 23:12:51 +02:00
parent 0380f832fb
commit 89b9204ab0
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scenenodegroups.cpp
View File

@@ -103,7 +103,7 @@ node_groups::update_map()
{ {
map::Objects.entries.clear(); map::Objects.entries.clear();
std::shared_ptr<map::track_switch> last_switch; std::unordered_map<std::string, std::shared_ptr<map::track_switch>> last_switch_map;
for (auto const &pair : m_groupmap) { for (auto const &pair : m_groupmap) {
auto const &group = pair.second; auto const &group = pair.second;
@@ -169,9 +169,15 @@ node_groups::update_map()
if (!(simulation::Events.FindEvent(sw_name + ":ac") || simulation::Events.FindEvent(sw_name + "ac"))) if (!(simulation::Events.FindEvent(sw_name + ":ac") || simulation::Events.FindEvent(sw_name + "ac")))
continue; continue;
if (!last_switch || last_switch->name != sw_name) { std::shared_ptr<map::track_switch> last_switch;
auto it = last_switch_map.find(sw_name);
if (it != last_switch_map.end()) {
last_switch = it->second;
} else {
last_switch = std::make_shared<map::track_switch>(); last_switch = std::make_shared<map::track_switch>();
last_switch->name = sw_name; last_switch->name = sw_name;
last_switch_map.insert(std::make_pair(sw_name, last_switch));
} }
if (lastc < 'a' || lastc > 'd') if (lastc < 'a' || lastc > 'd')
@@ -194,7 +200,7 @@ node_groups::update_map()
last_switch->location = (last_switch->track[0]->location() + last_switch->track[1]->location() + last_switch->track[2]->location() + last_switch->track[3]->location()) / 4.0; last_switch->location = (last_switch->track[0]->location() + last_switch->track[1]->location() + last_switch->track[2]->location() + last_switch->track[3]->location()) / 4.0;
map::Objects.entries.push_back(last_switch); map::Objects.entries.push_back(last_switch);
last_switch.reset(); last_switch_map.erase(sw_name);
} }
} else { } else {
if (TEventLauncher *launcher = dynamic_cast<TEventLauncher*>(node)) { if (TEventLauncher *launcher = dynamic_cast<TEventLauncher*>(node)) {