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

Read clipmap from clipmap file (already converted) instead of converting it on the fly

Browse Source
This commit is contained in:
rackover 2021-04-05 16:26:15 +02:00
parent 953dcd2057
commit fe2e2f1b3c
1 changed files with 24 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
#include "StdInclude.hpp" #include "StdInclude.hpp"
#define IW4X_CLIPMAP_VERSION 1 #define IW4X_CLIPMAP_VERSION 2
namespace Assets namespace Assets
{ {
@ -605,7 +605,7 @@ namespace Assets
} }
int version = reader.read<int>(); int version = reader.read<int>();
if (version != IW4X_CLIPMAP_VERSION) if (version > IW4X_CLIPMAP_VERSION)
{ {
Components::Logger::Error(0, "Reading clipmap '%s' failed, expected version is %d, but it was %d!", name.data(), IW4X_CLIPMAP_VERSION, version); Components::Logger::Error(0, "Reading clipmap '%s' failed, expected version is %d, but it was %d!", name.data(), IW4X_CLIPMAP_VERSION, version);
} }
@ -881,77 +881,38 @@ namespace Assets
clipMap->smodelNodeCount = reader.read<unsigned short>(); clipMap->smodelNodeCount = reader.read<unsigned short>();
clipMap->smodelNodes = reader.readArray<Game::SModelAabbNode>(clipMap->smodelNodeCount); clipMap->smodelNodes = reader.readArray<Game::SModelAabbNode>(clipMap->smodelNodeCount);
clipMap->checksum = reader.read<int>();
clipMap->mapEnts = Components::AssetHandler::FindAssetForZone(Game::XAssetType::ASSET_TYPE_MAP_ENTS, Utils::String::VA("maps/mp/%s.d3dbsp", name.data()), builder).mapEnts; clipMap->mapEnts = Components::AssetHandler::FindAssetForZone(Game::XAssetType::ASSET_TYPE_MAP_ENTS, Utils::String::VA("maps/mp/%s.d3dbsp", name.data()), builder).mapEnts;
// add triggers to mapEnts // add triggers to mapEnts
if (version >= 2) {
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;
Game::TriggerHull* hulls = builder->getAllocator()->allocateArray<Game::TriggerHull>(clipMap->mapEnts->trigger.hullCount * sizeof(Game::TriggerHull)); Game::TriggerHull* hulls = builder->getAllocator()->allocateArray<Game::TriggerHull>(clipMap->mapEnts->trigger.hullCount);
Game::TriggerModel* models = builder->getAllocator()->allocateArray<Game::TriggerModel>(clipMap->mapEnts->trigger.count * sizeof(Game::TriggerModel)); Game::TriggerModel* models = builder->getAllocator()->allocateArray<Game::TriggerModel>(clipMap->mapEnts->trigger.count);
Game::TriggerSlab* slabs = builder->getAllocator()->allocateArray<Game::TriggerSlab>(clipMap->mapEnts->trigger.slabCount * sizeof(Game::TriggerSlab));
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)
{ {
Game::TriggerHull trigHull = {}; models[i] = reader.read<Game::TriggerModel>();
trigHull.bounds = clipMap->cmodels[i].bounds; hulls[i] = reader.read<Game::TriggerHull>();
trigHull.contents = clipMap->cmodels[i].leaf.brushContents | clipMap->cmodels[i].leaf.terrainContents;;
Game::TriggerModel trigMod = {};
trigMod.hullCount = 1;
trigMod.firstHull = i /*- skipped*/;
trigMod.contents = clipMap->cmodels[i].leaf.brushContents | clipMap->cmodels[i].leaf.terrainContents;;
auto* node = &clipMap->leafbrushNodes[clipMap->cmodels[i].leaf.leafBrushNode];
if (node->leafBrushCount) {
////skipped++;
//continue; // skip empty brushes
int baseHull = hullCountSoFar;
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;
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; size_t slabCount = reader.read<size_t>();
trigHull.slabCount = slabCountSoFar - baseSlab; clipMap->mapEnts->trigger.slabCount = slabCount;
} Game::TriggerSlab* slabs = builder->getAllocator()->allocateArray<Game::TriggerSlab>(clipMap->mapEnts->trigger.slabCount);
for (int i = 0; i < clipMap->mapEnts->trigger.slabCount; i++) {
slabs[i] = reader.read<Game::TriggerSlab>();
} }
models[i/* - skipped*/] = trigMod;
hulls[i/* - skipped*/] = trigHull;
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];
}
clipMap->checksum = reader.read<int>();
// This mustn't be null and has to have at least 1 'valid' entry. // This mustn't be null and has to have at least 1 'valid' entry.
if (!clipMap->smodelNodeCount || !clipMap->smodelNodes) if (!clipMap->smodelNodeCount || !clipMap->smodelNodes)