From 25292cef767452c024fbcb72a18fa119da7b3003 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Sat, 3 Jun 2023 13:42:13 +0200 Subject: [PATCH] Disable too agressive culling of renderabletrails for now (closes #2653) --- .../missions/voyager/voyager2.asset | 2 +- modules/base/rendering/renderabletrail.cpp | 22 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset index 4d30bab6bd..4f51d02d36 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset @@ -305,7 +305,7 @@ local VoyagerTrailEncounterNeptune = { EnableFade = false, Color = { 0.70, 0.50, 0.20 }, -- @TODO: Probably an off-by-one bug in RenderableTrailTrajectory? - StartTime = "1989 AUG 23 23:30:00", + StartTime = "1989 AUG 23 22:30:00", EndTime = "1989 AUG 26", SampleInterval = 100 }, diff --git a/modules/base/rendering/renderabletrail.cpp b/modules/base/rendering/renderabletrail.cpp index accd13c3cd..f6a25cdf22 100644 --- a/modules/base/rendering/renderabletrail.cpp +++ b/modules/base/rendering/renderabletrail.cpp @@ -438,18 +438,18 @@ void RenderableTrail::render(const RenderData& data, RendererTasks&) { _primaryRenderInformation.first; // Culling - const glm::dvec3 trailPosWorld = glm::dvec3( - modelTransform * _primaryRenderInformation._localTransform * - glm::dvec4(0.0, 0.0, 0.0, 1.0) - ); - const double distance = glm::distance(trailPosWorld, data.camera.eyePositionVec3()); + //const glm::dvec3 trailPosWorld = glm::dvec3( + // modelTransform * _primaryRenderInformation._localTransform * + // glm::dvec4(0.0, 0.0, 0.0, 1.0) + //); + //const double distance = glm::distance(trailPosWorld, data.camera.eyePositionVec3()); - if (distance > boundingSphere() * DISTANCE_CULLING_RADII) { - // Reset - global::renderEngine->openglStateCache().resetBlendState(); - global::renderEngine->openglStateCache().resetDepthState(); - return; - } + //if (distance > boundingSphere() * DISTANCE_CULLING_RADII) { + // // Reset + // global::renderEngine->openglStateCache().resetBlendState(); + // global::renderEngine->openglStateCache().resetDepthState(); + // return; + //} // Render the primary batch of vertices internalRender(