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

Skip text (un-baked) includes on the visual load pass

Browse Source 
Pass filtering (infrastructure eager / visual deferred) relies on the per-node
markers that only a binary twin carries. An un-baked text include has no markers,
so it can't be split: it loads in full during the infrastructure pass. Reopening
it on the visual pass reprocessed every node a second time and, for parameterized
text includes, re-ran their models against a parser whose parameters no longer
applied, leaking a literal "(pN)" into TAnimModel::Load -> std::stoi throw ->
crash while streaming visuals. Drop the text include on the visual pass; its
content already loaded on the first pass. Fully-baked include trees are unaffected
(their children replay as twins and defer normally).
This commit is contained in:
maj00r
2026-06-24 18:31:39 +02:00
parent 06d44b50b0
commit 16b39a21b4
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utilities/parser.cpp
View File

@@ -645,6 +645,18 @@ void cParser::startIncludeDirect(std::string includefile, std::vector<std::strin
// consistently (e.g. visuals-only on the second pass) // consistently (e.g. visuals-only on the second pass)
mIncludeParser->setReplayPass(m_replaypass); mIncludeParser->setReplayPass(m_replaypass);
// pass filtering (infra eager / visual deferred) relies on the per-node markers that
// only a binary twin carries. an un-baked (text) include has no markers, so it can't
// be split: it is loaded in full during the infrastructure pass. on the visual pass we
// must therefore NOT reopen it -- doing so would reprocess every node a second time
// (duplicates) and, for parameterized text includes, re-run their models against a
// parser whose parameters no longer apply, leaking a literal "(pN)" into the model
// loader (which then throws). drop it; its content already loaded on the first pass.
if ((m_replaypass == scene::scenery_load_pass::visual) && (false == mIncludeParser->m_replay)) {
mIncludeParser = nullptr;
return;
}
// a binary-twin replay child reports mSize 0 but is still valid // a binary-twin replay child reports mSize 0 but is still valid
if (mIncludeParser->mSize <= 0 && (false == mIncludeParser->m_replay)) { if (mIncludeParser->mSize <= 0 && (false == mIncludeParser->m_replay)) {
ErrorLog("Bad include: can't open file \"" + includefile + "\""); ErrorLog("Bad include: can't open file \"" + includefile + "\"");