mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-24 13:09:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/retina' into feature/globebrowsing

Browse Source
This commit is contained in:
kalbl
2016-10-20 21:04:18 +02:00
parent 2f32e67b87 febf8c9a1b
commit 6ca7cc997c
22 changed files with 12196 additions and 7314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/engine/openspaceengine.cpp
View File

@@ -744,7 +744,7 @@ void OpenSpaceEngine::loadFonts() {
LERROR("Error initializing default font renderer");
ghoul::fontrendering::FontRenderer::defaultRenderer().setFramebufferSize(
glm::vec2(_windowWrapper->currentWindowSize())
_renderEngine->fontResolution()
);
}
@@ -896,6 +896,7 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
glm::vec2 mousePosition = _windowWrapper->mousePosition();
//glm::ivec2 drawBufferResolution = _windowWrapper->currentDrawBufferResolution();
glm::ivec2 windowSize = _windowWrapper->currentWindowSize();
glm::ivec2 renderingSize = _windowWrapper->currentWindowResolution();
uint32_t mouseButtons = _windowWrapper->mouseButtons(2);
//glm::vec2 windowBufferCorrectionFactor = glm::vec2(
@@ -911,7 +912,7 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
_gui->startFrame(
static_cast<float>(dt),
glm::vec2(windowSize),
glm::vec2(1.f),
glm::vec2(renderingSize),
mousePosition,
mouseButtons
);