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

more work at parsing trainsets in launcher

Browse Source
This commit is contained in:
milek7
2019-08-10 15:16:38 +02:00
parent da6343166a
commit 4489aa31ee
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
launcher/scenery_scanner.cpp
View File

@@ -87,8 +87,29 @@ void scenery_scanner::parse_trainset(cParser &parser)
parser.getTokens(4);
parser >> trainset.name >> trainset.track >> trainset.offset >> trainset.velocity;
while (parser.peek() != "endtrainset")
parser.getTokens();
while (parser.peek() == "node") {
std::string node_name, datafolder, skinfile, mmdfile, drivertype, loadtype, destination;
int offset, coupling, loadcount;
parser.getTokens(2); // range_max, range_min
parser.getTokens(1, false); // name
parser >> node_name;
if (!parser.expectToken("dynamic"))
break;
parser.getTokens(7);
parser >> datafolder >> skinfile >> mmdfile >> offset >> drivertype >> coupling >> loadcount;
parser.getTokens();
if (parser.peek() != "enddynamic") {
parser >> loadtype;
parser.getTokens();
}
parser.getTokens();
}
trainset.file_bounds.second = parser.Line();
}

6
simulationstateserializer.cpp
View File

@@ -831,9 +831,9 @@ state_serializer::deserialize_dynamic( cParser &Input, scene::scratch_data &Scra
auto skinfile { Input.getToken<std::string>() };
auto mmdfile { Input.getToken<std::string>() };
std::replace(datafolder.begin(), datafolder.end(), '\\', '/');
std::replace(skinfile.begin(), skinfile.end(), '\\', '/');
std::replace(mmdfile.begin(), mmdfile.end(), '\\', '/');
replace_slashes(datafolder);
replace_slashes(skinfile);
replace_slashes(mmdfile);
auto const pathname = (
Scratchpad.trainset.is_open ?