scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-07 08:15:59 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

map appended-submodel textures before changing the virtual POF

Browse Source 
When appending submodels would take the combined POF past
MAX_MODEL_TEXTURES, the limit was only noticed partway through, after the
submodel array had been grown, subsystems copied, and n_textures
incremented past the limit, which later loops over maps[] then overran.
Work out the texture mapping first, and give up before touching the model.

Also skip the -1 texture id of untextured flat polygons, which was being
assigned a texture slot, and which replace_textures_used then used to
index Num_verts and Num_polies.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
Goober5000andClaude Opus 5.5 committed 2026-10-08 03:02:23 -04:00
1 parent 1d13fc2a83
commit 7f71b169dd
1 file changed
+24 -14
Download Patch File Download Diff File Expand all files Collapse all files
code/model/modelreplace.cpp
+24 -14
View File
@@ -379,6 +379,26 @@ void VirtualPOFOperationAddSubmodel::process(polymodel* pm, model_read_deferred_
}
if (!has_name_collision) {
//Assign new texture indices before changing anything, so that running out of textures leaves the model intact
SCP_vector<SCP_set<int>> texturesUsed;
SCP_map<int, int> textureIDReplace;
int new_n_textures = pm->n_textures;
for (int submodel : to_copy_submodels) {
texturesUsed.emplace_back(model_get_textures_used(appendingPM, submodel));
for (int textureID : texturesUsed.back()) {
//Flat polygons are untextured
if (textureID < 0)
continue;
if (textureIDReplace.find(textureID) == textureIDReplace.end())
textureIDReplace.emplace(textureID, new_n_textures++);
}
}
if (new_n_textures > MAX_MODEL_TEXTURES) {
Warning(LOCATION, "Failed to add submodel %s of POF %s to virtual POF %s, combined POF has too many (over %d) textures.", subobjNameSrc.c_str(), appendingPOF.c_str(), virtualPof.name.c_str(), MAX_MODEL_TEXTURES);
return;
}
pm->n_textures = new_n_textures;
int old_n_submodel = reallocate_and_copy_array(pm->submodel, pm->n_models, to_copy_submodels.size());
SCP_unordered_map<int, int> replaceSubobjNo;
@@ -397,8 +417,6 @@ void VirtualPOFOperationAddSubmodel::process(polymodel* pm, model_read_deferred_
int deltaDepth = (pm->submodel[dest_subobj_no].depth + 1) - appendingPM->submodel[src_subobj_no].depth;
SCP_map<int, int> textureIDReplace;
//Copy over new data. This one needs to be fully free'd afterwards, so make sure to nullptr the respective pointers before freeing later
for (int i = 0; i < (int)to_copy_submodels.size(); i++) {
auto& newSubmodel = pm->submodel[i + old_n_submodel];
@@ -408,18 +426,10 @@ void VirtualPOFOperationAddSubmodel::process(polymodel* pm, model_read_deferred_
newSubmodel.depth += deltaDepth;
//Store texture replacement indices
const auto& textureIDs = model_get_textures_used(appendingPM, to_copy_submodels[i]);
for (const auto& textureID : textureIDs) {
auto it = textureIDReplace.find(textureID);
if (it == textureIDReplace.end()) {
int newID = pm->n_textures++;
if (pm->n_textures > MAX_MODEL_TEXTURES) {
Warning(LOCATION, "Failed to add submodel %s of POF %s to virtual POF %s, combined POF has too many (over %d) textures.", subobjNameSrc.c_str(), appendingPOF.c_str(), virtualPof.name.c_str(), MAX_MODEL_TEXTURES);
return;
}
it = textureIDReplace.emplace(textureID, newID).first;
}
deferredTasks.texture_replacements[i + old_n_submodel].replacementIds[textureID] = it->second;
for (int textureID : texturesUsed[i]) {
if (textureID < 0)
continue;
deferredTasks.texture_replacements[i + old_n_submodel].replacementIds[textureID] = textureIDReplace.at(textureID);
}
//Clear old pointer to data