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

Coding style adaptations

Browse Source 
Adapt to changes in Ghoul
This commit is contained in:
Alexander Bock
2020-08-25 13:47:03 +02:00
parent 11ad1df863
commit 2cca451898
20 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/atmosphere/rendering/atmospheredeferredcaster.cpp
+4 -4
View File
@@ -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);
modules/base/rendering/grids/renderableboxgrid.cpp
+3 -3
View File
@@ -32,8 +32,8 @@
#include <openspace/util/updatestructures.h>
#include <openspace/documentation/verifier.h>
#include <ghoul/glm.h>
#include <ghoul/opengl/openglstatecache.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/opengl/openglstatecache.h>
#include <ghoul/opengl/programobject.h>
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&) {
modules/base/rendering/grids/renderablegrid.cpp
+2 -2
View File
@@ -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&) {
modules/base/rendering/grids/renderableradialgrid.cpp
+2 -2
View File
@@ -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&) {
modules/base/rendering/grids/renderablesphericalgrid.cpp
+2 -2
View File
@@ -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&) {
modules/base/rendering/renderablecartesianaxes.cpp
+2 -2
View File
@@ -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
modules/base/rendering/renderablenodeline.cpp
+2 -2
View File
@@ -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() {
modules/base/rendering/screenspaceframebuffer.cpp
+2 -2
View File
@@ -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<GLint>(-size.x * xratio),
static_cast<GLint>(-size.y * yratio),
static_cast<GLsizei>(resolution.x * xratio),
static_cast<GLsizei>(resolution.y * yratio)
);
global::renderEngine.openglStateCache().setViewPortState(viewport);
global::renderEngine.openglStateCache().setViewportState(viewport);
GLint defaultFBO = _framebuffer->getActiveObject();
_framebuffer->activate();
modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
+2 -2
View File
@@ -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();
}
modules/digitaluniverse/rendering/renderabledumeshes.cpp
+3 -3
View File
@@ -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,
modules/digitaluniverse/rendering/renderableplanescloud.cpp
+2 -2
View File
@@ -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,
modules/galaxy/rendering/renderablegalaxy.cpp
+2 -2
View File
@@ -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) {
modules/globebrowsing/src/tileprovider.cpp
+1 -1
View File
@@ -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 };
modules/space/rendering/renderablestars.cpp
+1 -1
View File
@@ -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&) {