zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 16:15:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert float expressions

Browse Source
This commit is contained in:
Jan 2021-12-29 10:16:28 +01:00
parent 96ad97b784
commit 0ede5b30d4
1 changed files with 67 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/ObjLoading/Game/IW4/Menu/MenuConverterIW4.cpp
View File

@ -631,6 +631,64 @@ namespace IW4
return output; return output;
} }
ItemFloatExpression* ConvertFloatExpressions(const CommonItemDef* item, const CommonMenuDef* parentMenu, int& floatExpressionCount) const
{
struct FloatExpressionLocation
{
ISimpleExpression* m_expression;
ItemFloatExpressionTarget m_target;
};
FloatExpressionLocation locations[]
{
{item->m_rect_x_exp.get(), ITEM_FLOATEXP_TGT_RECT_X},
{item->m_rect_y_exp.get(), ITEM_FLOATEXP_TGT_RECT_Y},
{item->m_rect_w_exp.get(), ITEM_FLOATEXP_TGT_RECT_W},
{item->m_rect_h_exp.get(), ITEM_FLOATEXP_TGT_RECT_H},
{item->m_forecolor_expressions.m_r_exp.get(), ITEM_FLOATEXP_TGT_FORECOLOR_R},
{item->m_forecolor_expressions.m_g_exp.get(), ITEM_FLOATEXP_TGT_FORECOLOR_G},
{item->m_forecolor_expressions.m_b_exp.get(), ITEM_FLOATEXP_TGT_FORECOLOR_B},
{item->m_forecolor_expressions.m_a_exp.get(), ITEM_FLOATEXP_TGT_FORECOLOR_A},
{item->m_forecolor_expressions.m_rgb_exp.get(), ITEM_FLOATEXP_TGT_FORECOLOR_RGB},
{item->m_glowcolor_expressions.m_r_exp.get(), ITEM_FLOATEXP_TGT_GLOWCOLOR_R},
{item->m_glowcolor_expressions.m_g_exp.get(), ITEM_FLOATEXP_TGT_GLOWCOLOR_G},
{item->m_glowcolor_expressions.m_b_exp.get(), ITEM_FLOATEXP_TGT_GLOWCOLOR_B},
{item->m_glowcolor_expressions.m_a_exp.get(), ITEM_FLOATEXP_TGT_GLOWCOLOR_A},
{item->m_glowcolor_expressions.m_rgb_exp.get(), ITEM_FLOATEXP_TGT_GLOWCOLOR_RGB},
{item->m_backcolor_expressions.m_r_exp.get(), ITEM_FLOATEXP_TGT_BACKCOLOR_R},
{item->m_backcolor_expressions.m_g_exp.get(), ITEM_FLOATEXP_TGT_BACKCOLOR_G},
{item->m_backcolor_expressions.m_b_exp.get(), ITEM_FLOATEXP_TGT_BACKCOLOR_B},
{item->m_backcolor_expressions.m_a_exp.get(), ITEM_FLOATEXP_TGT_BACKCOLOR_A},
{item->m_backcolor_expressions.m_rgb_exp.get(), ITEM_FLOATEXP_TGT_BACKCOLOR_RGB},
};
floatExpressionCount = 0;
for(const auto& [expression, target] : locations)
{
if (expression)
floatExpressionCount++;
}
if (floatExpressionCount <= 0)
return nullptr;
auto* floatExpressions = static_cast<ItemFloatExpression*>(m_memory->Alloc(sizeof(ItemFloatExpression) * floatExpressionCount));
auto floatExpressionIndex = 0;
for (const auto& [expression, target] : locations)
{
if (!expression)
continue;
assert(floatExpressionIndex < floatExpressionCount && floatExpressionIndex >= 0);
floatExpressions[floatExpressionIndex].target = target;
floatExpressions[floatExpressionIndex].expression = ConvertExpression(expression, parentMenu, item);
floatExpressionIndex++;
}
return floatExpressions;
}
_NODISCARD itemDef_s* ConvertItem(const CommonMenuDef& parentMenu, const CommonItemDef& commonItem) const _NODISCARD itemDef_s* ConvertItem(const CommonMenuDef& parentMenu, const CommonItemDef& commonItem) const
{ {
auto* item = m_memory->Create<itemDef_s>(); auto* item = m_memory->Create<itemDef_s>();
@ -682,7 +740,7 @@ namespace IW4
item->textExp = ConvertOrApplyStatement(item->text, commonItem.m_text_expression.get(), &parentMenu, &commonItem); item->textExp = ConvertOrApplyStatement(item->text, commonItem.m_text_expression.get(), &parentMenu, &commonItem);
item->materialExp = ConvertOrApplyStatement(item->window.background, commonItem.m_material_expression.get(), &parentMenu, &commonItem); item->materialExp = ConvertOrApplyStatement(item->window.background, commonItem.m_material_expression.get(), &parentMenu, &commonItem);
item->disabledExp = ConvertExpression(commonItem.m_disabled_expression.get(), &parentMenu, &commonItem); item->disabledExp = ConvertExpression(commonItem.m_disabled_expression.get(), &parentMenu, &commonItem);
// FloatExpressions item->floatExpressions = ConvertFloatExpressions(&commonItem, &parentMenu, item->floatExpressionCount);
item->gameMsgWindowIndex = commonItem.m_game_message_window_index; item->gameMsgWindowIndex = commonItem.m_game_message_window_index;
item->gameMsgWindowMode = commonItem.m_game_message_window_mode; item->gameMsgWindowMode = commonItem.m_game_message_window_mode;
item->fxLetterTime = commonItem.m_fx_letter_time; item->fxLetterTime = commonItem.m_fx_letter_time;
@ -692,13 +750,12 @@ namespace IW4
return item; return item;
} }
void ConvertMenuItems(menuDef_t* menu, const CommonMenuDef& commonMenu) const itemDef_s** ConvertMenuItems(const CommonMenuDef& commonMenu, int& itemCount) const
{ {
if (commonMenu.m_items.empty()) if (commonMenu.m_items.empty())
{ {
menu->itemCount = 0; itemCount = 0;
menu->items = nullptr; return nullptr;
return;
} }
auto* items = static_cast<itemDef_s**>(m_memory->Alloc(sizeof(void*) * commonMenu.m_items.size())); auto* items = static_cast<itemDef_s**>(m_memory->Alloc(sizeof(void*) * commonMenu.m_items.size()));
@ -707,8 +764,9 @@ namespace IW4
for (auto i = 0u; i < commonMenu.m_items.size(); i++) for (auto i = 0u; i < commonMenu.m_items.size(); i++)
items[i] = ConvertItem(commonMenu, *commonMenu.m_items[i]); items[i] = ConvertItem(commonMenu, *commonMenu.m_items[i]);
menu->items = items; itemCount = static_cast<int>(commonMenu.m_items.size());
menu->itemCount = commonMenu.m_items.size();
return items;
} }
public: public:
@ -767,7 +825,7 @@ namespace IW4
menu->onCloseRequest = ConvertEventHandlerSet(commonMenu.m_on_request_close.get(), &commonMenu); menu->onCloseRequest = ConvertEventHandlerSet(commonMenu.m_on_request_close.get(), &commonMenu);
menu->onESC = ConvertEventHandlerSet(commonMenu.m_on_esc.get(), &commonMenu); menu->onESC = ConvertEventHandlerSet(commonMenu.m_on_esc.get(), &commonMenu);
menu->onKey = ConvertKeyHandler(commonMenu.m_key_handlers, &commonMenu); menu->onKey = ConvertKeyHandler(commonMenu.m_key_handlers, &commonMenu);
ConvertMenuItems(menu, commonMenu); menu->items = ConvertMenuItems(commonMenu, menu->itemCount);
menu->expressionData = m_conversion_zone_state->m_supporting_data; menu->expressionData = m_conversion_zone_state->m_supporting_data;
return menu; return menu;