Fixing android bugs and more
This commit is contained in:
1 parent
5b21ba615e
commit
fc93eb6680
55 files changed
+1192
-141
No files matched your search
+5
-2
@@ -202,6 +202,7 @@ namespace FRG {
|
||||
|
||||
GameUiState uiState_ = GameUiState::Gameplay;
|
||||
Inventory* inventory = nullptr;
|
||||
bool isPlayerInCreditsMenu = false;
|
||||
int inventorySelectedIndex_ = -1;
|
||||
|
||||
int inventoryMenuStackDepth_ = 0;
|
||||
@@ -265,6 +266,8 @@ namespace FRG {
|
||||
std::shared_ptr<UiNode> mainMenuRoot;
|
||||
std::shared_ptr<UiNode> aboutScreenRoot;
|
||||
std::shared_ptr<UiNode> creditsScreenRoot;
|
||||
std::shared_ptr<UiNode> portraitCreditsScreenRoot;
|
||||
|
||||
std::shared_ptr<UiNode> settingsScreenRoot;
|
||||
std::shared_ptr<UiNode> settingsGraphicsScreenRoot;
|
||||
std::shared_ptr<UiNode> languageScreenRoot;
|
||||
@@ -317,11 +320,11 @@ namespace FRG {
|
||||
// OFFSET_UP / OFFSET_DOWN = how far the FBO extends above / below screen center.
|
||||
// Height = UP + DOWN. Quad: y0 = projH/2 - DOWN, y1 = projH/2 + UP.
|
||||
static constexpr float CHAT_FBO_WIDTH_L = 469.0f;
|
||||
static constexpr float CHAT_FBO_OFFSET_UP_L = 260.0f;
|
||||
static constexpr float CHAT_FBO_OFFSET_UP_L = 240.0f;
|
||||
static constexpr float CHAT_FBO_OFFSET_DOWN_L = 70.0f;
|
||||
|
||||
static constexpr float CHAT_FBO_WIDTH_P = 670.0f;
|
||||
static constexpr float CHAT_FBO_OFFSET_UP_P = 360.0f;
|
||||
static constexpr float CHAT_FBO_OFFSET_UP_P = 356.0f;
|
||||
static constexpr float CHAT_FBO_OFFSET_DOWN_P = 70.0f;
|
||||
|
||||
std::unique_ptr<FrameBuffer> chatFrameBuffer_;
|
||||
|
||||
Reference in new issue
Block a user