diff --git a/modules/debugging/rendering/renderabledebugplane.cpp b/modules/debugging/rendering/renderabledebugplane.cpp index 544dc26c72..b7118b27f6 100644 --- a/modules/debugging/rendering/renderabledebugplane.cpp +++ b/modules/debugging/rendering/renderabledebugplane.cpp @@ -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); diff --git a/modules/globebrowsing/tile/tileprovider.cpp b/modules/globebrowsing/tile/tileprovider.cpp index 9edca53ce9..5dcb7ac7c3 100644 --- a/modules/globebrowsing/tile/tileprovider.cpp +++ b/modules/globebrowsing/tile/tileprovider.cpp @@ -70,7 +70,7 @@ namespace openspace { _font = OsEng.fontManager().font("Mono", _fontSize); _fontRenderer = std::unique_ptr(FontRenderer::createDefault()); - _fontRenderer->setWindowSize(textureSize); + _fontRenderer->setFramebufferSize(textureSize); glGenFramebuffers(1, &_fbo); } diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 30739e8a85..5c57033ec0 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -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())); } diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index f7fdc74218..18e3c9a9ad 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -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