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

Merge branch 'master' into feature/model-opacity

Browse Source 
* Solve conflicts in renderablemodel.cpp and renderabletrail.cpp
This commit is contained in:
Malin E
2023-04-12 17:03:40 +02:00
parent 94e8f90d1a 649442aca9
commit dccd439dde
110 changed files with 1679 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/renderabletrail.cpp
+1 -1
View File
@@ -433,7 +433,7 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) {
);
const double distance = glm::distance(trailPosWorld, data.camera.eyePositionVec3());
if (distance > _boundingSphere * DISTANCE_CULLING_RADII) {
if (distance > boundingSphere() * DISTANCE_CULLING_RADII) {
// Reset
global::renderEngine->openglStateCache().resetBlendState();
global::renderEngine->openglStateCache().resetDepthState();