mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-27 06:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make onscreen gui not break if resolution is changed

Browse Source
This commit is contained in:
Alexander Bock
2016-02-07 15:09:25 +01:00
parent 312d52c038
commit 50f1743067
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/ghoul
+1 -1
Submodule ext/ghoul updated: 7f72d4ec0a...559b2bee29
modules/onscreengui/src/gui.cpp
+6 -7
View File
@@ -74,7 +74,7 @@ namespace {
// Setup orthographic projection matrix
const float width = ImGui::GetIO().DisplaySize.x;
const float height = ImGui::GetIO().DisplaySize.y;
static const glm::mat4 ortho(
const glm::mat4 ortho(
2.f / width, 0.0f, 0.0f, 0.0f,
0.0f, 2.0f / -height, 0.0f, 0.0f,
0.0f, 0.0f, -1.0f, 0.0f,
@@ -242,18 +242,17 @@ void GUI::initializeGL() {
void GUI::deinitializeGL() {
_program = nullptr;
if (vao) glDeleteVertexArrays(1, &vao);
if (vbo) glDeleteBuffers(1, &vbo);
glDeleteVertexArrays(1, &vao);
glDeleteBuffers(1, &vbo);
_property.deinitializeGL();
_performance.deinitializeGL();
_help.deinitializeGL();
}
void GUI::startFrame(float deltaTime,
const glm::vec2& windowSize,
const glm::vec2& mousePos,
uint32_t mouseButtonsPressed)
void GUI::startFrame(float deltaTime, const glm::vec2& windowSize,
const glm::vec2& mousePos,
uint32_t mouseButtonsPressed)
{
ImGuiIO& io = ImGui::GetIO();