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

Merge branch 'master' into project/b612-asteroid-uncertainty

Browse Source
This commit is contained in:
Roxeena
2025-03-06 11:46:44 +01:00
parent f9fe7e65f6 737976a8d2
commit eade3c08c8
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/base/rendering/grids/renderablesphericalgrid.cpp
View File

@@ -230,14 +230,13 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&) {
// Change GL state:
#ifndef __APPLE__
glLineWidth(_lineWidth);
#else // ^^^^ __APPLE__ // !__APPLE__ vvvv
#else // ^^^^ !__APPLE__ // __APPLE__ vvvv
glLineWidth(1.f);
#endif // __APPLE__
glEnablei(GL_BLEND, 0);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_LINE_SMOOTH);
glDepthMask(false);
glBindVertexArray(_vaoID);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _iBufferID);
@@ -275,6 +274,11 @@ void RenderableSphericalGrid::render(const RenderData& data, RendererTasks&) {
);
_labels->render(data, modelViewProjectionTransform, orthoRight, orthoUp);
}
// Reset
global::renderEngine->openglStateCache().resetBlendState();
global::renderEngine->openglStateCache().resetLineState();
global::renderEngine->openglStateCache().resetDepthState();
}
void RenderableSphericalGrid::update(const UpdateData&) {