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

[clipMap_t] some attempts to generate triggers

Browse Source
This commit is contained in:
TheApadayo 2017-06-07 14:15:19 -04:00
parent 445c7825c0
commit 9997367ded
2 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,11 +210,11 @@ namespace Assets
{ {
if (node[i].leafBrushCount > 0) if (node[i].leafBrushCount > 0)
{ {
if (node[i].data.brushes) if (node[i].data.leaf.brushes)
{ {
if (builder->hasPointer(node[i].data.brushes)) if (builder->hasPointer(node[i].data.leaf.brushes))
{ {
node[i].data.brushes = builder->getPointer(node[i].data.brushes); node[i].data.leaf.brushes = builder->getPointer(node[i].data.leaf.brushes);
} }
else else
{ {
@ -222,11 +222,11 @@ namespace Assets
for (short j = 0; j < node[i].leafBrushCount; ++j) for (short j = 0; j < node[i].leafBrushCount; ++j)
{ {
builder->storePointer(&node[i].data.brushes[j]); builder->storePointer(&node[i].data.leaf.brushes[j]);
buffer->save(&node[i].data.brushes[j]); buffer->save(&node[i].data.leaf.brushes[j]);
} }
Utils::Stream::ClearPointer(&node[i].data.brushes); Utils::Stream::ClearPointer(&node[i].data.leaf.brushes);
} }
} }
} }
@ -727,7 +727,7 @@ namespace Assets
if (clipMap->cLeafBrushNodes[i].leafBrushCount > 0) if (clipMap->cLeafBrushNodes[i].leafBrushCount > 0)
{ {
clipMap->cLeafBrushNodes[i].data.brushes = reader.readArray<unsigned short>(clipMap->cLeafBrushNodes[i].leafBrushCount); clipMap->cLeafBrushNodes[i].data.leaf.brushes = reader.readArray<unsigned short>(clipMap->cLeafBrushNodes[i].leafBrushCount);
} }
} }
} }
@ -884,6 +884,30 @@ namespace Assets
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
/*
std::list<Game::TriggerSlab> slabs;
std::list<Game::TriggerHull> hulls;
std::list<Game::TriggerModel> models;
for (int i = 0; i < clipMap->numCModels; ++i)
{
Game::cLeafBrushNode_t* node = &clipMap->cLeafBrushNodes[clipMap->cModels[i].leaf.leafBrushNode];
if (!node->leafBrushCount) continue; // skip empty brushes
int baseHull = hulls.size();
for (int j = 0; j < node->leafBrushCount; ++j)
{
Game::cbrush_t* brush = &clipMap->cBrushes[node->data.leaf.brushes[j]];
int baseSlab = slabs.size();
for (int k = 0; k < brush->numsides; ++k)
{
Game::TriggerSlab curSlab;
}
}
}
*/
// 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)
{ {

16
src/Game/Structs.hpp
View File

@ -2580,13 +2580,25 @@ namespace Game
unsigned __int16 *brushes; unsigned __int16 *brushes;
}; };
struct cLeafBrushNodeChildren_t
{
float dist;
float range;
unsigned __int16 childOffset[2];
};
union cLeafBrushNodeData_t
{
cLeafBrushNodeLeaf_t leaf;
cLeafBrushNodeChildren_t children;
};
struct cLeafBrushNode_t struct cLeafBrushNode_t
{ {
char axis; char axis;
__int16 leafBrushCount; __int16 leafBrushCount;
int contents; int contents;
cLeafBrushNodeLeaf_t data; cLeafBrushNodeData_t data;
char pad[8];
}; };
struct cmodel_t struct cmodel_t