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

Minor clipmap improvements

Browse Source
This commit is contained in:
LJW-Dev
2026-02-07 19:41:40 +08:00
committed by Jan Laupetin
parent 6be8143c85
commit 07619d5ec4
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
+10 -3
View File
@@ -402,7 +402,7 @@ namespace BSP
} }
} }
void ClipMapLinker::loadBSPTree(clipMap_t* clipMap, BSPData* bsp) bool ClipMapLinker::loadBSPTree(clipMap_t* clipMap, BSPData* bsp)
{ {
vec3_t worldMins; vec3_t worldMins;
vec3_t worldMaxs; vec3_t worldMaxs;
@@ -418,7 +418,11 @@ 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);
assert(!tree->isLeaf); 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++)
{ {
@@ -466,6 +470,8 @@ namespace BSP
clipMap->nodes[nodeIdx].plane = &clipMap->info.planes[nodeIdx]; clipMap->nodes[nodeIdx].plane = &clipMap->info.planes[nodeIdx];
con::info("Highest leaf object count: {}", highestLeafObjectCount); con::info("Highest leaf object count: {}", highestLeafObjectCount);
return true;
} }
bool ClipMapLinker::loadPartitions(clipMap_t* clipMap, BSPData* bsp) bool ClipMapLinker::loadPartitions(clipMap_t* clipMap, BSPData* bsp)
@@ -600,7 +606,8 @@ namespace BSP
if (!loadPartitions(clipMap, bsp)) if (!loadPartitions(clipMap, bsp))
return false; return false;
loadBSPTree(clipMap, bsp); if (!loadBSPTree(clipMap, bsp))
return false;
return true; return true;
} }
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;
void addAABBTreeFromLeaf(clipMap_t* clipMap, BSPTree* tree, size_t* out_parentCount, size_t* out_parentStartIndex); void addAABBTreeFromLeaf(clipMap_t* clipMap, BSPTree* tree, size_t* out_parentCount, size_t* out_parentStartIndex);
int16_t loadBSPNode(clipMap_t* clipMap, BSPTree* tree); int16_t loadBSPNode(clipMap_t* clipMap, BSPTree* tree);
void 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);
}; };