diff --git a/assets/buildings/forest_hut/textures/icon.png b/assets/buildings/forest_hut/textures/icon.png new file mode 100644 index 0000000..3d90b50 Binary files /dev/null and b/assets/buildings/forest_hut/textures/icon.png differ diff --git a/assets/buildings/stone_mason/textures/icon.png b/assets/buildings/stone_mason/textures/icon.png new file mode 100644 index 0000000..da7b3b1 Binary files /dev/null and b/assets/buildings/stone_mason/textures/icon.png differ diff --git a/src/game/UILayer.cpp b/src/game/UILayer.cpp index 1279966..efff703 100644 --- a/src/game/UILayer.cpp +++ b/src/game/UILayer.cpp @@ -33,6 +33,8 @@ void UILayer::onAttach() { AssetManager::loadTexture("background", "assets/textures/texture.png", Loader::instance()); AssetManager::loadTexture("inventory_background", "assets/textures/inventory_background.png", Loader::instance()); + AssetManager::loadTexture("forest_hut_icon", "assets/buildings/forest_hut/textures/icon.png", Loader::instance()); + AssetManager::loadTexture("stone_mason_icon", "assets/buildings/stone_mason/textures/icon.png", Loader::instance()); rootContainer = std::make_unique(); diff --git a/src/game/ui/components/UiBuildingMenuContainer.cpp b/src/game/ui/components/UiBuildingMenuContainer.cpp index 3617c4d..6836fb5 100644 --- a/src/game/ui/components/UiBuildingMenuContainer.cpp +++ b/src/game/ui/components/UiBuildingMenuContainer.cpp @@ -4,14 +4,25 @@ #include "UiBuildingMenuContainer.h" +#include "../../../engine/core/gui/uiComponent/UiImage.h" #include "../../../engine/renderer/loader/AssetManager.h" UiBuildingMenuContainer::UiBuildingMenuContainer() { uiPositioner.getLayout().height = SizeValue(200.f, SizeUnit::Pixels); uiPositioner.getLayout().width = SizeValue(.6f, SizeUnit::Percent); uiPositioner.getLayout().flexDirection = FlexDirection::Row; - uiPositioner.getLayout().justifyContent = JustifyContent::Center; + uiPositioner.getLayout().justifyContent = JustifyContent::Start; uiPositioner.getLayout().alignItems = AlignItems::Center; + + LayoutStyle iconStyle; + iconStyle.width = SizeValue(150, SizeUnit::Pixels); + iconStyle.height = SizeValue(150.f, SizeUnit::Pixels); + + auto forest_icon = std::make_unique(AssetManager::getTexture("forest_hut_icon")->getTextureID(), AssetManager::getTexture("background")->getTextureID(), iconStyle); + addChild(std::move(forest_icon)); + + auto stone_mason_icon = std::make_unique(AssetManager::getTexture("stone_mason_icon")->getTextureID(), AssetManager::getTexture("background")->getTextureID(), iconStyle); + addChild(std::move(stone_mason_icon)); } void UiBuildingMenuContainer::onCollectRenderData(UiRenderBundle &uiRenderBundle) {