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

fix: randoms

Browse Source
This commit is contained in:
Simon Pribylski
2021-11-04 18:34:49 +01:00
parent 95e9c270db
commit 0d992da55b
3 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/render/WorldRenderer.h
View File

@@ -26,7 +26,7 @@ private:
glm::vec2 m_CamPos; glm::vec2 m_CamPos;
glm::vec2 m_CursorPos; glm::vec2 m_CursorPos;
glm::vec2 m_HoldCursorPos; glm::vec2 m_HoldCursorPos;
float m_Zoom = 1; float m_Zoom;
float m_CamSensibility = 1; float m_CamSensibility = 1;
bool m_TowerPlacePopupOpened = false; bool m_TowerPlacePopupOpened = false;
VertexCache m_TowersCache; VertexCache m_TowersCache;

2
src/render/WorldRenderer.cpp
View File

@@ -18,7 +18,7 @@ void WorldRenderer::loadModels() {
std::cout << "Vertex Count : " << m_WorldVao->getVertexCount() << std::endl; std::cout << "Vertex Count : " << m_WorldVao->getVertexCount() << std::endl;
} }
WorldRenderer::WorldRenderer(game::World* world, client::ClientGame* client) : m_Client(client), m_Renderer(m_Client->getRenderer()), m_World(world) { WorldRenderer::WorldRenderer(game::World* world, client::ClientGame* client) : m_Client(client), m_Renderer(m_Client->getRenderer()), m_World(world), m_Zoom(1) {
m_Renderer->setZoom(m_Zoom); m_Renderer->setZoom(m_Zoom);
m_Renderer->setCamMovement({}); m_Renderer->setCamMovement({});
} }

13
src/window/Display.cpp
View File

@@ -151,19 +151,6 @@ void pollEvents() {
} }
ImGui_ImplSDL2_ProcessEvent(&event); ImGui_ImplSDL2_ProcessEvent(&event);
} }
// activating screen keyboard for Android devices
#ifdef __ANDROID__
static bool keyboardShown = false;
if(ImGui::GetIO().WantTextInput != keyboardShown){
if(ImGui::GetIO().WantTextInput){
SDL_StartTextInput();
}else{
SDL_StopTextInput();
}
keyboardShown = ImGui::GetIO().WantTextInput;
}
#endif
} }
bool isCloseRequested() { bool isCloseRequested() {