mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 12:59:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: last commit did not consider the updated FontRenderer interface

Browse Source
This commit is contained in:
nusic
2016-07-13 14:22:36 -04:00
parent f4f0e53b2c
commit 5f2d692230
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/debugging/rendering/renderabledebugplane.cpp
View File

@@ -90,6 +90,9 @@ RenderableDebugPlane::RenderableDebugPlane(const ghoul::Dictionary& dictionary)
_billboard = billboard;
}
int texture;
if (dictionary.getValue("Texture", texture))
_texture = texture;
addProperty(_texture);
addProperty(_billboard);

2
modules/globebrowsing/tile/tileprovider.cpp
View File

@@ -70,7 +70,7 @@ namespace openspace {
_font = OsEng.fontManager().font("Mono", _fontSize);
_fontRenderer = std::unique_ptr<FontRenderer>(FontRenderer::createDefault());
_fontRenderer->setWindowSize(textureSize);
_fontRenderer->setFramebufferSize(textureSize);
glGenFramebuffers(1, &_fbo);
}

2
src/engine/openspaceengine.cpp
View File

@@ -674,7 +674,7 @@ void OpenSpaceEngine::loadFonts() {
if (!initSuccess)
LERROR("Error initializing default font renderer");
ghoul::fontrendering::FontRenderer::defaultRenderer().setWindowSize(glm::vec2(_windowWrapper->currentDrawBufferResolution()));
ghoul::fontrendering::FontRenderer::defaultRenderer().setFramebufferSize(glm::vec2(_windowWrapper->currentDrawBufferResolution()));
}

2
src/rendering/renderengine.cpp
View File

@@ -347,7 +347,7 @@ void RenderEngine::postSynchronizationPreDraw() {
if (windowResized) {
glm::ivec2 res = OsEng.windowWrapper().currentDrawBufferResolution();
_renderer->setResolution(res);
ghoul::fontrendering::FontRenderer::defaultRenderer().setWindowSize(glm::vec2(res));
ghoul::fontrendering::FontRenderer::defaultRenderer().setFramebufferSize(glm::vec2(res));
}
// update and evaluate the scene starting from the root node