From 2cca45189801dfbbc688e5e19ff2f31883521907 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 25 Aug 2020 13:47:03 +0200 Subject: [PATCH] Coding style adaptations Adapt to changes in Ghoul --- data/assets/customization/globebrowsing.asset | 1 + ext/ghoul | 2 +- include/openspace/rendering/renderengine.h | 8 ++++++-- include/openspace/util/screenlog.h | 2 +- .../rendering/atmospheredeferredcaster.cpp | 8 ++++---- .../base/rendering/grids/renderableboxgrid.cpp | 6 +++--- modules/base/rendering/grids/renderablegrid.cpp | 4 ++-- .../base/rendering/grids/renderableradialgrid.cpp | 4 ++-- .../rendering/grids/renderablesphericalgrid.cpp | 4 ++-- .../base/rendering/renderablecartesianaxes.cpp | 4 ++-- modules/base/rendering/renderablenodeline.cpp | 4 ++-- modules/base/rendering/screenspaceframebuffer.cpp | 4 ++-- .../rendering/renderablebillboardscloud.cpp | 4 ++-- .../rendering/renderabledumeshes.cpp | 6 +++--- .../rendering/renderableplanescloud.cpp | 4 ++-- modules/galaxy/rendering/renderablegalaxy.cpp | 4 ++-- modules/globebrowsing/src/tileprovider.cpp | 2 +- modules/space/rendering/renderablestars.cpp | 2 +- src/rendering/framebufferrenderer.cpp | 15 +++++++-------- src/rendering/renderengine.cpp | 2 +- 20 files changed, 47 insertions(+), 43 deletions(-) diff --git a/data/assets/customization/globebrowsing.asset b/data/assets/customization/globebrowsing.asset index 2401b7e508..dcff5f418e 100644 --- a/data/assets/customization/globebrowsing.asset +++ b/data/assets/customization/globebrowsing.asset @@ -31,6 +31,7 @@ local vrt_folders = { -- We recommend using this folder for HiRISE openspace.absPath('${BASE}/../OpenSpaceData/Mars/HiRISE'), -- if not and you have a custom path for HiRISE layers, enter it below + '' }, Moon = { -- Add folders here whose contents will be automatically added to the Moon globe diff --git a/ext/ghoul b/ext/ghoul index d7d95dbc3e..f4837e7cf2 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit d7d95dbc3e5dcadd2f455fea989071ad4c514318 +Subproject commit f4837e7cf2ec3166ba82164eb12510b811382ece diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h index 00db014de8..420491f030 100644 --- a/include/openspace/rendering/renderengine.h +++ b/include/openspace/rendering/renderengine.h @@ -35,11 +35,15 @@ #include namespace ghoul { + namespace fontrendering { class Font; } + namespace opengl { + class ProgramObject; + class OpenGLStateCache; + } // namespace opengl + class Dictionary; class SharedMemory; } // ghoul -namespace ghoul::fontrendering { class Font; } -namespace ghoul::opengl { class ProgramObject; class OpenGLStateCache; } namespace openspace { diff --git a/include/openspace/util/screenlog.h b/include/openspace/util/screenlog.h index 1619079830..ed8de1228e 100644 --- a/include/openspace/util/screenlog.h +++ b/include/openspace/util/screenlog.h @@ -29,8 +29,8 @@ #include #include -#include #include +#include namespace openspace { diff --git a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp index d321ce7a3a..783b70f4b7 100644 --- a/modules/atmosphere/rendering/atmospheredeferredcaster.cpp +++ b/modules/atmosphere/rendering/atmospheredeferredcaster.cpp @@ -1194,7 +1194,7 @@ void AtmosphereDeferredcaster::executeCalculations(GLuint quadCalcVAO, } // Restores OpenGL blending state - global::renderEngine.openglStateCache().setBlendState(); + global::renderEngine.openglStateCache().resetBlendState(); } void AtmosphereDeferredcaster::preCalculateAtmosphereParam() { @@ -1213,9 +1213,9 @@ void AtmosphereDeferredcaster::preCalculateAtmosphereParam() { glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO); GLint m_viewport[4]; - global::renderEngine.openglStateCache().viewPort(m_viewport); + global::renderEngine.openglStateCache().viewport(m_viewport); - // Creates the FBO for the cFglGetalculations + // Creates the FBO for the calculations GLuint calcFBO; glGenFramebuffers(1, &calcFBO); glBindFramebuffer(GL_FRAMEBUFFER, calcFBO); @@ -1239,7 +1239,7 @@ void AtmosphereDeferredcaster::preCalculateAtmosphereParam() { // Restores system state glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO); - global::renderEngine.openglStateCache().setViewPortState(m_viewport); + global::renderEngine.openglStateCache().setViewportState(m_viewport); glDeleteBuffers(1, &quadCalcVBO); glDeleteVertexArrays(1, &quadCalcVAO); glDeleteFramebuffers(1, &calcFBO); diff --git a/modules/base/rendering/grids/renderableboxgrid.cpp b/modules/base/rendering/grids/renderableboxgrid.cpp index 6d8feec0c1..672ebc2e6d 100644 --- a/modules/base/rendering/grids/renderableboxgrid.cpp +++ b/modules/base/rendering/grids/renderableboxgrid.cpp @@ -32,8 +32,8 @@ #include #include #include -#include #include +#include #include namespace { @@ -203,8 +203,8 @@ void RenderableBoxGrid::render(const RenderData& data, RendererTasks&){ _gridProgram->deactivate(); // Restores GL State - global::renderEngine.openglStateCache().setBlendState(); - global::renderEngine.openglStateCache().setLineState(); + global::renderEngine.openglStateCache().resetBlendState(); + global::renderEngine.openglStateCache().resetLineState(); } void RenderableBoxGrid::update(const UpdateData&) { diff --git a/modules/base/rendering/grids/renderablegrid.cpp b/modules/base/rendering/grids/renderablegrid.cpp index ca2a9246e1..1bd1617c42 100644 --- a/modules/base/rendering/grids/renderablegrid.cpp +++ b/modules/base/rendering/grids/renderablegrid.cpp @@ -219,8 +219,8 @@ void RenderableGrid::render(const RenderData& data, RendererTasks&){ _gridProgram->deactivate(); // Restores GL State - global::renderEngine.openglStateCache().setBlendState(); - global::renderEngine.openglStateCache().setLineState(); + global::renderEngine.openglStateCache().resetBlendState(); + global::renderEngine.openglStateCache().resetLineState(); } void RenderableGrid::update(const UpdateData&) { diff --git a/modules/base/rendering/grids/renderableradialgrid.cpp b/modules/base/rendering/grids/renderableradialgrid.cpp index c0df853352..7e94730f67 100644 --- a/modules/base/rendering/grids/renderableradialgrid.cpp +++ b/modules/base/rendering/grids/renderableradialgrid.cpp @@ -282,8 +282,8 @@ void RenderableRadialGrid::render(const RenderData& data, RendererTasks&) { _gridProgram->deactivate(); // Restores GL State - global::renderEngine.openglStateCache().setBlendState(); - global::renderEngine.openglStateCache().setLineState(); + global::renderEngine.openglStateCache().resetBlendState(); + global::renderEngine.openglStateCache().resetLineState(); } void RenderableRadialGrid::update(const UpdateData&) { diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp index 532f77768c..8c537ced91 100644 --- a/modules/base/rendering/grids/renderablesphericalgrid.cpp +++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp @@ -224,8 +224,8 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&){ _gridProgram->deactivate(); // Restores GL State - global::renderEngine.openglStateCache().setBlendState(); - global::renderEngine.openglStateCache().setLineState(); + global::renderEngine.openglStateCache().resetBlendState(); + global::renderEngine.openglStateCache().resetLineState(); } void RenderableSphericalGrid::update(const UpdateData&) { diff --git a/modules/base/rendering/renderablecartesianaxes.cpp b/modules/base/rendering/renderablecartesianaxes.cpp index 76f3ce42fa..152fbea5a8 100644 --- a/modules/base/rendering/renderablecartesianaxes.cpp +++ b/modules/base/rendering/renderablecartesianaxes.cpp @@ -247,8 +247,8 @@ void RenderableCartesianAxes::render(const RenderData& data, RendererTasks&){ _program->deactivate(); // Restores GL State - global::renderEngine.openglStateCache().setBlendState(); - global::renderEngine.openglStateCache().setLineState(); + global::renderEngine.openglStateCache().resetBlendState(); + global::renderEngine.openglStateCache().resetLineState(); } } // namespace openspace diff --git a/modules/base/rendering/renderablenodeline.cpp b/modules/base/rendering/renderablenodeline.cpp index a1de634a64..34f579126c 100644 --- a/modules/base/rendering/renderablenodeline.cpp +++ b/modules/base/rendering/renderablenodeline.cpp @@ -304,8 +304,8 @@ void RenderableNodeLine::render(const RenderData& data, RendererTasks&) { // Restore GL State unbindGL(); _program->deactivate(); - global::renderEngine.openglStateCache().setBlendState(); - global::renderEngine.openglStateCache().setLineState(); + global::renderEngine.openglStateCache().resetBlendState(); + global::renderEngine.openglStateCache().resetLineState(); } void RenderableNodeLine::validateNodes() { diff --git a/modules/base/rendering/screenspaceframebuffer.cpp b/modules/base/rendering/screenspaceframebuffer.cpp index 7c01bdf16c..ab5b8f4620 100644 --- a/modules/base/rendering/screenspaceframebuffer.cpp +++ b/modules/base/rendering/screenspaceframebuffer.cpp @@ -113,14 +113,14 @@ void ScreenSpaceFramebuffer::render() { if (!_renderFunctions.empty()) { GLint viewport[4]; //glGetIntegerv(GL_VIEWPORT, viewport); - global::renderEngine.openglStateCache().viewPort(viewport); + global::renderEngine.openglStateCache().viewport(viewport); glViewport( static_cast(-size.x * xratio), static_cast(-size.y * yratio), static_cast(resolution.x * xratio), static_cast(resolution.y * yratio) ); - global::renderEngine.openglStateCache().setViewPortState(viewport); + global::renderEngine.openglStateCache().setViewportState(viewport); GLint defaultFBO = _framebuffer->getActiveObject(); _framebuffer->activate(); diff --git a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp index 82c2c3d023..97b8834666 100644 --- a/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp +++ b/modules/digitaluniverse/rendering/renderablebillboardscloud.cpp @@ -860,8 +860,8 @@ void RenderableBillboardsCloud::renderBillboards(const RenderData& data, glBindVertexArray(0); _program->deactivate(); - global::renderEngine.openglStateCache().setBlendState(); - global::renderEngine.openglStateCache().setDepthState(); + global::renderEngine.openglStateCache().resetBlendState(); + global::renderEngine.openglStateCache().resetDepthState(); } diff --git a/modules/digitaluniverse/rendering/renderabledumeshes.cpp b/modules/digitaluniverse/rendering/renderabledumeshes.cpp index 02995e46d1..38f12c8326 100644 --- a/modules/digitaluniverse/rendering/renderabledumeshes.cpp +++ b/modules/digitaluniverse/rendering/renderabledumeshes.cpp @@ -424,7 +424,7 @@ void RenderableDUMeshes::renderMeshes(const RenderData&, case Wire: glLineWidth(_lineWidth); glDrawArrays(GL_LINE_STRIP, 0, pair.second.numV); - global::renderEngine.openglStateCache().setLineState(); + global::renderEngine.openglStateCache().resetLineState(); break; case Point: glDrawArrays(GL_POINTS, 0, pair.second.numV); @@ -439,8 +439,8 @@ void RenderableDUMeshes::renderMeshes(const RenderData&, _program->deactivate(); // Restores GL State - global::renderEngine.openglStateCache().setDepthState(); - global::renderEngine.openglStateCache().setBlendState(); + global::renderEngine.openglStateCache().resetDepthState(); + global::renderEngine.openglStateCache().resetBlendState(); } void RenderableDUMeshes::renderLabels(const RenderData& data, diff --git a/modules/digitaluniverse/rendering/renderableplanescloud.cpp b/modules/digitaluniverse/rendering/renderableplanescloud.cpp index a5525fc346..48cce16a4e 100644 --- a/modules/digitaluniverse/rendering/renderableplanescloud.cpp +++ b/modules/digitaluniverse/rendering/renderableplanescloud.cpp @@ -585,8 +585,8 @@ void RenderablePlanesCloud::renderPlanes(const RenderData&, _program->deactivate(); // Restores OpenGL Rendering State - global::renderEngine.openglStateCache().setBlendState(); - global::renderEngine.openglStateCache().setDepthState(); + global::renderEngine.openglStateCache().resetBlendState(); + global::renderEngine.openglStateCache().resetDepthState(); } void RenderablePlanesCloud::renderLabels(const RenderData& data, diff --git a/modules/galaxy/rendering/renderablegalaxy.cpp b/modules/galaxy/rendering/renderablegalaxy.cpp index fa9e4b6a51..c80a5c4ed2 100644 --- a/modules/galaxy/rendering/renderablegalaxy.cpp +++ b/modules/galaxy/rendering/renderablegalaxy.cpp @@ -682,8 +682,8 @@ void RenderableGalaxy::renderPoints(const RenderData& data) { _pointsProgram->deactivate(); // Restores OpenGL Rendering State - global::renderEngine.openglStateCache().setBlendState(); - global::renderEngine.openglStateCache().setDepthState(); + global::renderEngine.openglStateCache().resetBlendState(); + global::renderEngine.openglStateCache().resetDepthState(); } void RenderableGalaxy::renderBillboards(const RenderData& data) { diff --git a/modules/globebrowsing/src/tileprovider.cpp b/modules/globebrowsing/src/tileprovider.cpp index 3c0a3240e1..a9969b716a 100644 --- a/modules/globebrowsing/src/tileprovider.cpp +++ b/modules/globebrowsing/src/tileprovider.cpp @@ -234,7 +234,7 @@ Tile tile(TextTileProvider& t, const TileIndex& tileIndex) { t.fontRenderer->render(*t.font, t.textPosition, t.text, t.textColor); glBindFramebuffer(GL_FRAMEBUFFER, defaultFBO); - global::renderEngine.openglStateCache().setViewPortState(); + global::renderEngine.openglStateCache().resetViewportState(); //glViewport(viewport[0], viewport[1], viewport[2], viewport[3]); tile = Tile{ texture, std::nullopt, Tile::Status::OK }; diff --git a/modules/space/rendering/renderablestars.cpp b/modules/space/rendering/renderablestars.cpp index 4fa2a213bd..8ccaf2d100 100644 --- a/modules/space/rendering/renderablestars.cpp +++ b/modules/space/rendering/renderablestars.cpp @@ -915,7 +915,7 @@ void RenderableStars::renderPSFToTexture() { //glDeleteFramebuffers(1, &convolveFBO); // Restores OpenGL blending state - global::renderEngine.openglStateCache().setBlendState(); + global::renderEngine.openglStateCache().resetBlendState(); } void RenderableStars::render(const RenderData& data, RendererTasks&) { diff --git a/src/rendering/framebufferrenderer.cpp b/src/rendering/framebufferrenderer.cpp index a97ceb4f69..439bf063c3 100644 --- a/src/rendering/framebufferrenderer.cpp +++ b/src/rendering/framebufferrenderer.cpp @@ -450,7 +450,6 @@ void FramebufferRenderer::initialize() { global::deferredcasterManager.addListener(*this); // Set Default Rendering OpenGL State - glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO); glEnablei(GL_BLEND, 0); glDisablei(GL_BLEND, 1); @@ -1124,8 +1123,8 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_defaultFBO); - GLint viewport[4] = {0}; - global::renderEngine.openglStateCache().viewPort(viewport); + GLint viewport[4] = { 0 }; + global::renderEngine.openglStateCache().viewport(viewport); // Set Render Pipeline State global::renderEngine.openglStateCache().setCachedStates(); @@ -1142,7 +1141,7 @@ void FramebufferRenderer::render(Scene* scene, Camera* camera, float blackoutFac TracyGpuZone("Deferred G-Buffer") GLint vp[4] = {viewport[0], viewport[1], _resolution.x, _resolution.y}; - global::renderEngine.openglStateCache().setViewPortState(vp); + global::renderEngine.openglStateCache().setViewportState(vp); glBindFramebuffer(GL_FRAMEBUFFER, _gBuffers.framebuffer); glDrawBuffers(3, ColorAttachmentArray); @@ -1252,8 +1251,8 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector glBindFramebuffer(GL_FRAMEBUFFER, _exitFramebuffer); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - GLint viewport[4] = {0}; - global::renderEngine.openglStateCache().viewPort(viewport); + GLint viewport[4] = { 0 }; + global::renderEngine.openglStateCache().viewport(viewport); ghoul::opengl::ProgramObject* exitProgram = _exitPrograms[raycaster].get(); if (exitProgram) { @@ -1271,7 +1270,7 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector static_cast(viewport[2] * s), static_cast(viewport[3] * s) }; - global::renderEngine.openglStateCache().setViewPortState(newVP); + global::renderEngine.openglStateCache().setViewportState(newVP); if (_downscaleVolumeRendering.currentDownscaleFactor != s) { _downscaleVolumeRendering.currentDownscaleFactor = s; @@ -1368,7 +1367,7 @@ void FramebufferRenderer::performRaycasterTasks(const std::vector } if (raycaster->downscaleRender() < 1.f) { - global::renderEngine.openglStateCache().setViewPortState(viewport); + global::renderEngine.openglStateCache().setViewportState(viewport); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _gBuffers.framebuffer); writeDownscaledVolume(); } diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp index 4653c618a9..3cecff94a0 100644 --- a/src/rendering/renderengine.cpp +++ b/src/rendering/renderengine.cpp @@ -919,7 +919,7 @@ RenderEngine::RendererImplementation RenderEngine::rendererImplementation() cons ghoul::opengl::OpenGLStateCache& RenderEngine::openglStateCache() { if (_openglStateCache == nullptr) { - _openglStateCache = ghoul::opengl::OpenGLStateCache::getInstance(); + _openglStateCache = ghoul::opengl::OpenGLStateCache::instance(); } return *_openglStateCache; }