zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-07-21 15:30:33 +00:00
Code Activity

fix: menu rect optimization not setting global values (#920)

Browse Source 
* fix: menu rect optimization not setting global values

* fix: relative item rects not considering optimized parent rect
This commit is contained in:
Jan Laupetin
2026-07-20 19:24:58 +02:00
committed by GitHub
parent 9c56a28ef4
commit fadcd74182
3 changed files with 500 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/ObjLoadingTests/Game/IW4/Menu/LoaderMenuListIW4Test.cpp
+124
View File
@@ -378,4 +378,128 @@ namespace test::game::iw4::menu::parsing::it
REQUIRE(item->action->eventHandlers[1]->eventData.unconditionalScript != nullptr);
REQUIRE(item->action->eventHandlers[1]->eventData.unconditionalScript == R"("play" "lol" ; )"s);
}
TEST_CASE("MenuParsingIW4IT: Optimized exp rect considers parent pos", "[parsing][converting][menu][it]")
{
MenuParsingItHelper helper;
helper.AddFile(R"testmenu(
{
menuDef
{
name "Blab"
rect 10 10 70 70;
itemDef
{
rect 20 20 40 40;
}
itemDef
{
rect 0 0 0 0;
exp rect x 20;
exp rect y 20;
exp rect w 40;
exp rect h 40;
}
}
})testmenu");
const auto result = helper.RunIntegrationTest();
REQUIRE(result.HasBeenSuccessful());
const auto* menuList = static_cast<MenuList*>(result.GetAssetInfo()->m_ptr);
const auto* menu = helper.GetMenuAsset("Blab");
REQUIRE(menuList->menuCount == 1);
REQUIRE(menuList->menus);
REQUIRE(menuList->menus[0] == menu);
REQUIRE(menu->window.name == "Blab"s);
CHECK_THAT(menu->window.rect.x, WithinRel(10.0f));
CHECK_THAT(menu->window.rect.y, WithinRel(10.0f));
CHECK_THAT(menu->window.rect.w, WithinRel(70.0f));
CHECK_THAT(menu->window.rect.h, WithinRel(70.0f));
REQUIRE(menu->itemCount == 2);
REQUIRE(menu->items != nullptr);
const auto* item0 = menu->items[0];
REQUIRE(item0 != nullptr);
CHECK_THAT(item0->window.rectClient.x, WithinRel(20.0f));
CHECK_THAT(item0->window.rectClient.y, WithinRel(20.0f));
CHECK_THAT(item0->window.rectClient.w, WithinRel(40.0f));
CHECK_THAT(item0->window.rectClient.h, WithinRel(40.0f));
CHECK_THAT(item0->window.rect.x, WithinRel(30.0f));
CHECK_THAT(item0->window.rect.y, WithinRel(30.0f));
CHECK_THAT(item0->window.rect.w, WithinRel(40.0f));
CHECK_THAT(item0->window.rect.h, WithinRel(40.0f));
const auto* item1 = menu->items[1];
REQUIRE(item1 != nullptr);
CHECK_THAT(item1->window.rectClient.x, WithinRel(20.0f));
CHECK_THAT(item1->window.rectClient.y, WithinRel(20.0f));
CHECK_THAT(item1->window.rectClient.w, WithinRel(40.0f));
CHECK_THAT(item1->window.rectClient.h, WithinRel(40.0f));
CHECK_THAT(item1->window.rect.x, WithinRel(30.0f));
CHECK_THAT(item1->window.rect.y, WithinRel(30.0f));
CHECK_THAT(item1->window.rect.w, WithinRel(40.0f));
CHECK_THAT(item1->window.rect.h, WithinRel(40.0f));
}
TEST_CASE("MenuParsingIW4IT: Optimized exp rect considers parent optimized pos", "[parsing][converting][menu][it]")
{
MenuParsingItHelper helper;
helper.AddFile(R"testmenu(
{
menuDef
{
name "Blab"
rect 0 0 1 1;
exp rect x 10;
exp rect y 10;
exp rect w 70;
exp rect h 70;
itemDef
{
rect 0 0 0 0;
exp rect x 20;
exp rect y 20;
exp rect w 40;
exp rect h 40;
}
}
})testmenu");
const auto result = helper.RunIntegrationTest();
REQUIRE(result.HasBeenSuccessful());
const auto* menuList = static_cast<MenuList*>(result.GetAssetInfo()->m_ptr);
const auto* menu = helper.GetMenuAsset("Blab");
REQUIRE(menuList->menuCount == 1);
REQUIRE(menuList->menus);
REQUIRE(menuList->menus[0] == menu);
REQUIRE(menu->window.name == "Blab"s);
CHECK_THAT(menu->window.rect.x, WithinRel(10.0f));
CHECK_THAT(menu->window.rect.y, WithinRel(10.0f));
CHECK_THAT(menu->window.rect.w, WithinRel(70.0f));
CHECK_THAT(menu->window.rect.h, WithinRel(70.0f));
REQUIRE(menu->itemCount == 1);
REQUIRE(menu->items != nullptr);
const auto* item0 = menu->items[0];
REQUIRE(item0 != nullptr);
CHECK_THAT(item0->window.rectClient.x, WithinRel(20.0f));
CHECK_THAT(item0->window.rectClient.y, WithinRel(20.0f));
CHECK_THAT(item0->window.rectClient.w, WithinRel(40.0f));
CHECK_THAT(item0->window.rectClient.h, WithinRel(40.0f));
CHECK_THAT(item0->window.rect.x, WithinRel(30.0f));
CHECK_THAT(item0->window.rect.y, WithinRel(30.0f));
CHECK_THAT(item0->window.rect.w, WithinRel(40.0f));
CHECK_THAT(item0->window.rect.h, WithinRel(40.0f));
}
} // namespace test::game::iw4::menu::parsing::it