mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add a correction factor for ImGui that converts between window coordinates and fbo coordinates (closing #95)

Browse Source
This commit is contained in:
Alexander Bock
2016-06-02 13:12:28 +02:00
parent de3edd5022
commit 1e8d329e3d
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/onscreengui/src/gui.cpp
+9 -5
View File
@@ -273,6 +273,7 @@ void GUI::deinitializeGL() {
}
void GUI::startFrame(float deltaTime, const glm::vec2& windowSize,
const glm::vec2& mousePosCorrectionFactor,
const glm::vec2& mousePos,
uint32_t mouseButtonsPressed)
{
@@ -280,11 +281,14 @@ void GUI::startFrame(float deltaTime, const glm::vec2& windowSize,
ImGuiIO& io = ImGui::GetIO();
io.DisplaySize = ImVec2(windowSize.x, windowSize.y);
io.DeltaTime = deltaTime;
#ifdef __APPLE__
io.MousePos = ImVec2(mousePos.x * 2, mousePos.y * 2);
#else
io.MousePos = ImVec2(mousePos.x, mousePos.y);
#endif
io.MousePos = ImVec2(mousePos.x * mousePosCorrectionFactor.x, mousePos.y * mousePosCorrectionFactor.y);
//#ifdef __APPLE__
// io.MousePos = ImVec2(mousePos.x * 2, mousePos.y * 2);
//#else
// io.MousePos = ImVec2(mousePos.x, mousePos.y);
//#endif
io.MouseDown[0] = mouseButtonsPressed & (1 << 0);
io.MouseDown[1] = mouseButtonsPressed & (1 << 1);