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

refactor: simplified brushmodels - gfx uses tris, col uses brushes only

Browse Source
This commit is contained in:
LJW-Dev
2026-04-25 18:38:15 +08:00
committed by Jan Laupetin
parent 99229fa1ac
commit 979707fe3f
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Game/T6/BSP/BSPCreator.cpp
+4 -7
View File
@@ -917,18 +917,16 @@ namespace
BSPEntity entity; BSPEntity entity;
std::string classname = node.extras->at("classname"); std::string classname = node.extras->at("classname");
if (!classname.compare("script_brushmodel_gfx") || !classname.compare("script_brushmodel_tris")) if (!classname.compare("script_brushmodel_gfx"))
entity.modelIndex = addScriptTerrainModel(jRoot, node, nodeMatrix); entity.modelIndex = addScriptTerrainModel(jRoot, node, nodeMatrix);
else if ((!classname.compare("script_brushmodel_box") || !classname.compare("script_brushmodel")) else if (!classname.compare("script_brushmodel") || (classname.starts_with("trigger_") || !classname.compare("info_volume")))
|| (classname.starts_with("trigger_") || !classname.compare("info_volume")))
entity.modelIndex = addScriptBrushModel(jRoot, node, nodeMatrix); entity.modelIndex = addScriptBrushModel(jRoot, node, nodeMatrix);
else else
entity.modelIndex = 0; entity.modelIndex = 0;
if (entity.modelIndex != 0 && node.extras->contains("model")) if (entity.modelIndex != 0 && node.extras->contains("model"))
{ {
con::error("Node {} cannot have a model property when its class is a trigger, info_volume, script_brushmodel_gfx, script_brushmodel_tris, " con::error("Node {} cannot have a model property when its class is a trigger, info_volume, script_brushmodel_gfx or script_brushmodel");
"script_brushmodel_box or script_brushmodel");
return false; return false;
} }
@@ -939,8 +937,7 @@ namespace
if (!key.compare("origin") || !key.compare("angles") || !key.compare("flags")) if (!key.compare("origin") || !key.compare("angles") || !key.compare("flags"))
continue; continue;
if (!key.compare("classname") if (!key.compare("classname") && !value.compare("script_brushmodel_gfx"))
&& (!value.compare("script_brushmodel_gfx") || !value.compare("script_brushmodel_tris") || !value.compare("script_brushmodel_box")))
value = "script_brushmodel"; value = "script_brushmodel";
BSPEntityEntry entry; BSPEntityEntry entry;