Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fixed clipmap trigger brushmodel conversion (correct indexing)

Browse Source
This commit is contained in:
rackover 2021-04-05 14:49:30 +02:00
parent 9b86825713
commit 529e44ac51
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/Components/Modules/AssetInterfaces/IclipMap_t.cpp
View File

@ -887,8 +887,6 @@ namespace Assets
// add triggers to mapEnts // add triggers to mapEnts
clipMap->mapEnts->trigger.count = clipMap->numSubModels; clipMap->mapEnts->trigger.count = clipMap->numSubModels;
clipMap->mapEnts->trigger.hullCount = clipMap->numSubModels; clipMap->mapEnts->trigger.hullCount = clipMap->numSubModels;
clipMap->mapEnts->trigger.slabCount = clipMap->numSubModels * 1000; clipMap->mapEnts->trigger.slabCount = clipMap->numSubModels * 1000;
@ -899,6 +897,11 @@ namespace Assets
int hullCountSoFar = 0; int hullCountSoFar = 0;
int slabCountSoFar = 0; int slabCountSoFar = 0;
//int skipped = 0;
Utils::Entities memEnts(clipMap->mapEnts->entityString);
std::vector<int> radioTriggers = memEnts.getRadioTriggerModels();
for (int i = 0; i < clipMap->numSubModels; ++i) for (int i = 0; i < clipMap->numSubModels; ++i)
{ {
@ -908,42 +911,45 @@ namespace Assets
Game::TriggerModel trigMod = {}; Game::TriggerModel trigMod = {};
trigMod.hullCount = 1; trigMod.hullCount = 1;
trigMod.firstHull = 0; trigMod.firstHull = i /*- skipped*/;
trigMod.contents = clipMap->cmodels[i].leaf.brushContents | clipMap->cmodels[i].leaf.terrainContents;; trigMod.contents = clipMap->cmodels[i].leaf.brushContents | clipMap->cmodels[i].leaf.terrainContents;;
auto* node = &clipMap->leafbrushNodes[clipMap->cmodels[i].leaf.leafBrushNode]; auto* node = &clipMap->leafbrushNodes[clipMap->cmodels[i].leaf.leafBrushNode];
if (!node->leafBrushCount) continue; // skip empty brushes if (node->leafBrushCount) {
////skipped++;
//continue; // skip empty brushes
int baseHull = hullCountSoFar; int baseHull = hullCountSoFar;
for (int j = 0; j < node->leafBrushCount; ++j) for (int j = 0; j < node->leafBrushCount; ++j)
{
auto* brush = &clipMap->brushes[node->data.leaf.brushes[j]];
auto baseSlab = slabCountSoFar;
for (int k = 0; k < brush->numsides; ++k)
{ {
Game::TriggerSlab curSlab; auto* brush = &clipMap->brushes[node->data.leaf.brushes[j]];
curSlab.dir[0] = brush->sides[k].plane->normal[0];
curSlab.dir[1] = brush->sides[k].plane->normal[1];
curSlab.dir[2] = brush->sides[k].plane->normal[2];
curSlab.halfSize = brush->sides[k].plane->dist;
curSlab.midPoint = 0.0f; // ??
slabs[slabCountSoFar] = curSlab; auto baseSlab = slabCountSoFar;
slabCountSoFar++; for (int k = 0; k < brush->numsides; ++k)
{
Game::TriggerSlab curSlab;
curSlab.dir[0] = brush->sides[k].plane->normal[0];
curSlab.dir[1] = brush->sides[k].plane->normal[1];
curSlab.dir[2] = brush->sides[k].plane->normal[2];
curSlab.halfSize = brush->sides[k].plane->dist;
curSlab.midPoint = 0.0f; // ??
slabs[slabCountSoFar] = curSlab;
slabCountSoFar++;
}
trigHull.firstSlab = baseSlab;
trigHull.slabCount = slabCountSoFar - baseSlab;
} }
trigHull.firstSlab = baseSlab;
trigHull.slabCount = slabCountSoFar - baseSlab;
} }
models[i] = trigMod; models[i/* - skipped*/] = trigMod;
hulls[i] = trigHull; hulls[i/* - skipped*/] = trigHull;
hullCountSoFar++; hullCountSoFar++;
} }
clipMap->mapEnts->trigger.models = &models[0];; clipMap->mapEnts->trigger.models = &models[0];
clipMap->mapEnts->trigger.hulls = &hulls[0]; clipMap->mapEnts->trigger.hulls = &hulls[0];
clipMap->mapEnts->trigger.slabs = &slabs[0]; clipMap->mapEnts->trigger.slabs = &slabs[0];