zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-07-04 18:21:49 +00:00
Code Activity

Make sure to only dump menu files once

Browse Source
This commit is contained in:
Jan
2021-12-31 16:34:42 +01:00
parent 28011d6b64
commit 5d1df29542
8 changed files with 174 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuDef.cpp
View File

@ -3,46 +3,22 @@
#include <filesystem>
#include <string>
#include "AssetDumperMenuList.h"
#include "ObjWriting.h"
#include "Game/IW4/GameAssetPoolIW4.h"
#include "Game/IW4/Menu/MenuDumperIW4.h"
#include "Menu/AbstractMenuDumper.h"
namespace fs = std::filesystem;
using namespace IW4;
const MenuList* AssetDumperMenuDef::GetParentMenuList(XAssetInfo<menuDef_t>* asset)
std::string AssetDumperMenuDef::GetPathForMenu(menu::MenuDumpingZoneState* zoneState, XAssetInfo<menuDef_t>* asset)
{
const auto* menu = asset->Asset();
const auto* gameAssetPool = dynamic_cast<GameAssetPoolIW4*>(asset->m_zone->m_pools.get());
for (const auto* menuList : *gameAssetPool->m_menu_list)
{
const auto* menuListAsset = menuList->Asset();
const auto menuDumpingState = zoneState->m_menu_dumping_state_map.find(asset->Asset());
for (auto menuIndex = 0; menuIndex < menuListAsset->menuCount; menuIndex++)
{
if (menuListAsset->menus[menuIndex] == menu)
return menuListAsset;
}
}
return nullptr;
}
std::string AssetDumperMenuDef::GetPathForMenu(XAssetInfo<menuDef_t>* asset)
{
const auto* list = GetParentMenuList(asset);
if (!list)
if (menuDumpingState == zoneState->m_menu_dumping_state_map.end())
return "ui_mp/" + std::string(asset->Asset()->window.name) + ".menu";
const fs::path p(list->name);
std::string parentPath;
if (p.has_parent_path())
parentPath = p.parent_path().string() + "/";
return parentPath + std::string(asset->Asset()->window.name) + ".menu";
return menuDumpingState->second.m_path;
}
bool AssetDumperMenuDef::ShouldDump(XAssetInfo<menuDef_t>* asset)
@ -53,16 +29,17 @@ bool AssetDumperMenuDef::ShouldDump(XAssetInfo<menuDef_t>* asset)
void AssetDumperMenuDef::DumpAsset(AssetDumpingContext& context, XAssetInfo<menuDef_t>* asset)
{
const auto* menu = asset->Asset();
const auto menuFilePath = GetPathForMenu(asset);
auto* zoneState = context.GetZoneAssetDumperState<menu::MenuDumpingZoneState>();
if(ObjWriting::ShouldHandleAssetType(ASSET_TYPE_MENULIST))
if(!ObjWriting::ShouldHandleAssetType(ASSET_TYPE_MENULIST))
{
// Don't dump menu file separately if the name matches the menu list
const auto* menuListParent = GetParentMenuList(asset);
if (menuListParent && menuFilePath == menuListParent->name)
return;
// Make sure menu paths based on menu lists are created
const auto* gameAssetPool = dynamic_cast<GameAssetPoolIW4*>(asset->m_zone->m_pools.get());
for (auto* menuListAsset : *gameAssetPool->m_menu_list)
AssetDumperMenuList::CreateDumpingStateForMenuList(zoneState, menuListAsset->Asset());
}
const auto menuFilePath = GetPathForMenu(zoneState, asset);
const auto assetFile = context.OpenAssetFile(menuFilePath);
if (!assetFile)

4
src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuDef.h
View File

@ -2,13 +2,13 @@
#include "Dumping/AbstractAssetDumper.h"
#include "Game/IW4/IW4.h"
#include "Menu/MenuDumpingZoneState.h"
namespace IW4
{
class AssetDumperMenuDef final : public AbstractAssetDumper<menuDef_t>
{
static const MenuList* GetParentMenuList(XAssetInfo<menuDef_t>* asset);
static std::string GetPathForMenu(XAssetInfo<menuDef_t>* asset);
static std::string GetPathForMenu(menu::MenuDumpingZoneState* zoneState, XAssetInfo<menuDef_t>* asset);
protected:
bool ShouldDump(XAssetInfo<menuDef_t>* asset) override;

90
src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuList.cpp
View File

@ -69,31 +69,21 @@ void AssetDumperMenuList::DumpFunctions(MenuDumper& menuDumper, const MenuList*
}
}
void AssetDumperMenuList::DumpMenus(MenuDumper& menuDumper, const MenuList* menuList)
void AssetDumperMenuList::DumpMenus(MenuDumper& menuDumper, menu::MenuDumpingZoneState* zoneState, const MenuList* menuList)
{
const fs::path p(menuList->name);
std::string parentPath;
if (p.has_parent_path())
parentPath = p.parent_path().string() + "/";
for (auto menuNum = 0; menuNum < menuList->menuCount; menuNum++)
{
const auto* menu = menuList->menus[menuNum];
const auto* menuAssetName = menu->window.name;
if (menuAssetName && menuAssetName[0] == ',')
menuAssetName = &menuAssetName[1];
std::ostringstream ss;
ss << parentPath << menuAssetName << ".menu";
const auto menuName = ss.str();
const auto menuDumpingState = zoneState->m_menu_dumping_state_map.find(menu);
if(menuDumpingState == zoneState->m_menu_dumping_state_map.end())
continue;
// If the menu was embedded directly as menu list write its data in the menu list file
if (menuName == menuList->name)
if (menuDumpingState->second.m_alias_menu_list == menuList)
menuDumper.WriteMenu(menu);
else
menuDumper.IncludeMenu(ss.str());
menuDumper.IncludeMenu(menuDumpingState->second.m_path);
}
}
@ -110,6 +100,8 @@ void AssetDumperMenuList::DumpAsset(AssetDumpingContext& context, XAssetInfo<Men
if (!assetFile)
return;
auto* zoneState = context.GetZoneAssetDumperState<menu::MenuDumpingZoneState>();
MenuDumper menuDumper(*assetFile);
menuDumper.Start();
@ -117,7 +109,71 @@ void AssetDumperMenuList::DumpAsset(AssetDumpingContext& context, XAssetInfo<Men
if(!ObjWriting::Configuration.MenuLegacyMode)
DumpFunctions(menuDumper, menuList);
DumpMenus(menuDumper, menuList);
DumpMenus(menuDumper, zoneState, menuList);
menuDumper.End();
}
std::string AssetDumperMenuList::PathForMenu(const std::string& menuListParentPath, const menuDef_t* menu)
{
const auto* menuAssetName = menu->window.name;
if (!menuAssetName)
return "";
if (menuAssetName[0] == ',')
menuAssetName = &menuAssetName[1];
std::ostringstream ss;
ss << menuListParentPath << menuAssetName << ".menu";
return ss.str();
}
void AssetDumperMenuList::CreateDumpingStateForMenuList(menu::MenuDumpingZoneState* zoneState, const MenuList* menuList)
{
if (menuList->menuCount <= 0 || menuList->menus == nullptr || menuList->name == nullptr)
return;
const std::string menuListName(menuList->name);
const fs::path p(menuListName);
std::string parentPath;
if (p.has_parent_path())
parentPath = p.parent_path().string() + "/";
for(auto i = 0; i < menuList->menuCount; i++)
{
auto* menu = menuList->menus[i];
if(menu == nullptr)
continue;
auto existingState = zoneState->m_menu_dumping_state_map.find(menu);
if(existingState == zoneState->m_menu_dumping_state_map.end())
{
auto menuPath = PathForMenu(parentPath, menu);
const auto isTheSameAsMenuList = menuPath == menuListName;
zoneState->CreateMenuDumpingState(menu, std::move(menuPath), isTheSameAsMenuList ? menuList : nullptr);
}
else if(existingState->second.m_alias_menu_list == nullptr)
{
auto menuPath = PathForMenu(parentPath, menu);
const auto isTheSameAsMenuList = menuPath == menuListName;
if (isTheSameAsMenuList)
{
existingState->second.m_alias_menu_list = menuList;
existingState->second.m_path = std::move(menuPath);
}
}
}
}
void AssetDumperMenuList::DumpPool(AssetDumpingContext& context, AssetPool<MenuList>* pool)
{
auto* zoneState = context.GetZoneAssetDumperState<menu::MenuDumpingZoneState>();
for(auto* asset : *pool)
CreateDumpingStateForMenuList(zoneState, asset->Asset());
AbstractAssetDumper<MenuList>::DumpPool(context, pool);
}

9
src/ObjWriting/Game/IW4/AssetDumpers/AssetDumperMenuList.h
View File

@ -3,6 +3,7 @@
#include "Dumping/AbstractAssetDumper.h"
#include "Game/IW4/IW4.h"
#include "Game/IW4/Menu/MenuDumperIW4.h"
#include "Menu/MenuDumpingZoneState.h"
namespace IW4
{
@ -11,10 +12,16 @@ namespace IW4
static std::vector<const ExpressionSupportingData*> GetAllUniqueExpressionSupportingData(const MenuList* menuList);
static void DumpFunctions(MenuDumper& menuDumper, const MenuList* menuList);
static void DumpMenus(MenuDumper& menuDumper, const MenuList* menuList);
static void DumpMenus(MenuDumper& menuDumper, menu::MenuDumpingZoneState* zoneState, const MenuList* menuList);
static std::string PathForMenu(const std::string& menuListParentPath, const menuDef_t* menu);
protected:
bool ShouldDump(XAssetInfo<MenuList>* asset) override;
void DumpAsset(AssetDumpingContext& context, XAssetInfo<MenuList>* asset) override;
public:
static void CreateDumpingStateForMenuList(menu::MenuDumpingZoneState* zoneState, const MenuList* menuList);
void DumpPool(AssetDumpingContext& context, AssetPool<MenuList>* pool) override;
};
}