zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-06-06 08:42:35 +00:00
Code Activity

feat: clipmap linker now has support for maps smaller than the minimum BSP node size

Browse Source
This commit is contained in:
LJW-Dev
2026-03-22 17:08:30 +08:00
committed by Jan Laupetin
parent 4ddb157a63
commit b26a8d4d9c
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
+22 -9
View File
@@ -390,10 +390,28 @@ namespace BSP
// Nodes are indexed by their index in the node array // Nodes are indexed by their index in the node array
// Leafs are indexed by (-1 - <leaf index>) // Leafs are indexed by (-1 - <leaf index>)
// See https://developer.valvesoftware.com/wiki/BSP_(Source) // See https://developer.valvesoftware.com/wiki/BSP_(Source)
int16_t ClipMapLinker::loadBSPNode(clipMap_t* clipMap, BSPTree* tree) int16_t ClipMapLinker::loadBSPNode(clipMap_t* clipMap, BSPTree* tree, bool isRoot)
{ {
if (tree->isLeaf) if (tree->isLeaf)
{ {
if (isRoot)
{
cplane_s plane;
plane.dist = 0;
plane.normal = normalX;
plane.type = 0;
plane.signbits = 0;
plane.pad[0] = 0;
plane.pad[1] = 0;
planeVec.emplace_back(plane);
cNode_t node;
node.plane = nullptr; // initalised after the BSP tree has been loaded
node.children[0] = -1;
node.children[1] = -1;
nodeVec.emplace_back(node);
}
cLeaf_s leaf; cLeaf_s leaf;
leaf.cluster = 0; // always use cluster 0 leaf.cluster = 0; // always use cluster 0
@@ -469,8 +487,8 @@ namespace BSP
cNode_t node; cNode_t node;
node.plane = nullptr; // initalised after the BSP tree has been loaded node.plane = nullptr; // initalised after the BSP tree has been loaded
node.children[0] = loadBSPNode(clipMap, tree->node->front.get()); node.children[0] = loadBSPNode(clipMap, tree->node->front.get(), false);
node.children[1] = loadBSPNode(clipMap, tree->node->back.get()); node.children[1] = loadBSPNode(clipMap, tree->node->back.get(), false);
nodeVec.at(nodeIndex) = node; nodeVec.at(nodeIndex) = node;
@@ -494,11 +512,6 @@ namespace BSP
BSPUtil::updateAABBWithPoint(vertex, worldMins, worldMaxs); BSPUtil::updateAABBWithPoint(vertex, worldMins, worldMaxs);
} }
std::unique_ptr<BSPTree> tree = std::make_unique<BSPTree>(worldMins.x, worldMins.y, worldMins.z, worldMaxs.x, worldMaxs.y, worldMaxs.z, 0); std::unique_ptr<BSPTree> tree = std::make_unique<BSPTree>(worldMins.x, worldMins.y, worldMins.z, worldMaxs.x, worldMaxs.y, worldMaxs.z, 0);
if (tree->isLeaf)
{
con::error("Map size is too small for BSP generation!");
return false;
}
for (int partitionIdx = 0; partitionIdx < clipMap->partitionCount; partitionIdx++) for (int partitionIdx = 0; partitionIdx < clipMap->partitionCount; partitionIdx++)
{ {
@@ -512,7 +525,7 @@ namespace BSP
} }
// load planes, nodes, leafs, and AABB trees // load planes, nodes, leafs, and AABB trees
loadBSPNode(clipMap, tree.get()); loadBSPNode(clipMap, tree.get(), true);
clipMap->info.planeCount = static_cast<int>(planeVec.size()); clipMap->info.planeCount = static_cast<int>(planeVec.size());
clipMap->info.planes = m_memory.Alloc<cplane_s>(planeVec.size()); clipMap->info.planes = m_memory.Alloc<cplane_s>(planeVec.size());
src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.h
+1 -1
View File
@@ -33,7 +33,7 @@ namespace BSP
size_t highestLeafObjectCount = 0; size_t highestLeafObjectCount = 0;
std::vector<size_t> partitionToMaterialMap; std::vector<size_t> partitionToMaterialMap;
void addAABBTreeFromLeaf(clipMap_t* clipMap, BSPTree* tree, size_t* out_parentCount, size_t* out_parentStartIndex, int* out_treeContents); void addAABBTreeFromLeaf(clipMap_t* clipMap, BSPTree* tree, size_t* out_parentCount, size_t* out_parentStartIndex, int* out_treeContents);
int16_t loadBSPNode(clipMap_t* clipMap, BSPTree* tree); int16_t loadBSPNode(clipMap_t* clipMap, BSPTree* tree, bool isRoot);
bool loadBSPTree(clipMap_t* clipMap, BSPData* bsp); bool loadBSPTree(clipMap_t* clipMap, BSPData* bsp);
bool loadPartitions(clipMap_t* clipMap, BSPData* bsp); bool loadPartitions(clipMap_t* clipMap, BSPData* bsp);
bool loadWorldCollision(clipMap_t* clipMap, BSPData* bsp); bool loadWorldCollision(clipMap_t* clipMap, BSPData* bsp);