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

improve cross track detection

Browse Source
This commit is contained in:
milek7
2020-10-20 18:40:13 +02:00
parent efb6e3f709
commit 374479e93c
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scenenodegroups.cpp
View File

@@ -53,11 +53,8 @@ node_groups::close()
return handle(); return handle();
} }
bool node_groups::assign_cross_switch(map::track_switch& sw, TTrack* track, std::string const &id, size_t idx) bool node_groups::assign_cross_switch(map::track_switch& sw, std::string &sw_name, std::string const &id, size_t idx)
{ {
std::string sw_name = track->name();
sw_name.pop_back();
sw.action[idx] = simulation::Events.FindEvent(sw_name + ":" + id); sw.action[idx] = simulation::Events.FindEvent(sw_name + ":" + id);
if (!sw.action[idx]) if (!sw.action[idx])
sw.action[idx] = simulation::Events.FindEvent(sw_name + id); sw.action[idx] = simulation::Events.FindEvent(sw_name + id);
@@ -72,6 +69,10 @@ bool node_groups::assign_cross_switch(map::track_switch& sw, TTrack* track, std:
auto names = multi->dump_children_names(); auto names = multi->dump_children_names();
for (auto it = names.begin(); it != names.end(); it++) { for (auto it = names.begin(); it != names.end(); it++) {
*it = it->substr(sw_name.size());
if (it->size() > 4)
continue;
int pos_a = it->find_last_of('a'); int pos_a = it->find_last_of('a');
int pos_b = it->find_last_of('b'); int pos_b = it->find_last_of('b');
int pos_c = it->find_last_of('c'); int pos_c = it->find_last_of('c');
@@ -162,6 +163,8 @@ node_groups::update_map()
char lastc = sw_name.back(); char lastc = sw_name.back();
sw_name.pop_back(); sw_name.pop_back();
if (sw_name.back() == '_')
sw_name.pop_back();
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;
@@ -179,13 +182,13 @@ node_groups::update_map()
if (!trk) if (!trk)
goto skip_e; goto skip_e;
if (!assign_cross_switch(*last_switch, track, "ac", 0)) if (!assign_cross_switch(*last_switch, sw_name, "ac", 0))
skip_e: continue; skip_e: continue;
if (!assign_cross_switch(*last_switch, track, "ad", 1)) if (!assign_cross_switch(*last_switch, sw_name, "ad", 1))
continue; continue;
if (!assign_cross_switch(*last_switch, track, "bc", 2)) if (!assign_cross_switch(*last_switch, sw_name, "bc", 2))
continue; continue;
if (!assign_cross_switch(*last_switch, track, "bd", 3)) if (!assign_cross_switch(*last_switch, sw_name, "bd", 3))
continue; continue;
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;

2
scenenodegroups.h
View File

@@ -65,7 +65,7 @@ private:
group_handle group_handle
create_handle(); create_handle();
bool bool
assign_cross_switch(map::track_switch&sw, TTrack *track, const std::string &id, size_t idx); assign_cross_switch(map::track_switch&sw, std::string &sw_name, const std::string &id, size_t idx);
// members // members
group_map m_groupmap; // map of established node groups group_map m_groupmap; // map of established node groups
std::stack<scene::group_handle> m_activegroup; // helper, group to be assigned to newly created nodes std::stack<scene::group_handle> m_activegroup; // helper, group to be assigned to newly created nodes