Persson-dev/Tower-Defense
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

feat: don't show tile select when tooltip

Browse Source
This commit is contained in:
Simon Pribylski
2021-12-12 16:59:57 +01:00
parent e7bf22cea6
commit 61166023df
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/render/gui/CastleTooltip.h
View File

@@ -21,6 +21,7 @@ public:
virtual void render(); virtual void render();
void setCastle(const game::TeamCastle* castle) { m_Castle = castle; } void setCastle(const game::TeamCastle* castle) { m_Castle = castle; }
bool isShown() { return m_Castle != nullptr; }
}; };
} // namespace gui } // namespace gui

1
include/render/gui/MobTooltip.h
View File

@@ -21,6 +21,7 @@ public:
virtual void render(); virtual void render();
void setMob(const game::Mob* mob) { m_Mob = mob; } void setMob(const game::Mob* mob) { m_Mob = mob; }
bool isShown() { return m_Mob != nullptr; }
}; };
} // namespace gui } // namespace gui

2
src/render/WorldRenderer.cpp
View File

@@ -101,6 +101,8 @@ void WorldRenderer::renderTowers() const {
void WorldRenderer::renderTileSelect() const { void WorldRenderer::renderTileSelect() const {
if (ImGui::IsAnyItemHovered()) return; if (ImGui::IsAnyItemHovered()) return;
if(m_MobTooltip->isShown() || m_CastleTooltip->isShown()) return;
Renderer::Model tileSelectModel; Renderer::Model tileSelectModel;
tileSelectModel.vao = m_SelectTileVao.get(); tileSelectModel.vao = m_SelectTileVao.get();
tileSelectModel.positon = { (int)m_CursorPos.x, (int)m_CursorPos.y }; tileSelectModel.positon = { (int)m_CursorPos.x, (int)m_CursorPos.y };