From ca29378d5448301cc8c9fa9f1576910fa8f37b3c Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Thu, 20 Nov 2025 16:56:54 +0100 Subject: [PATCH] Update assets to adapt to the bugfix in the RenderableSphericalGrid --- data/assets/nightsky/altaz.asset | 5 ++++- data/assets/scene/digitaluniverse/grids.asset | 6 ++++-- .../scene/solarsystem/heliosphere/todayssun/grid.asset | 7 +++---- modules/base/rendering/grids/renderablesphericalgrid.cpp | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/data/assets/nightsky/altaz.asset b/data/assets/nightsky/altaz.asset index 494ca1aeeb..1f171e0dd2 100644 --- a/data/assets/nightsky/altaz.asset +++ b/data/assets/nightsky/altaz.asset @@ -58,7 +58,10 @@ local AltAzGrid = { Opacity = 0.8, Color = { 0.2, 0.4, 0.2 }, LineWidth = 2.0, - RenderBinMode = "PostDeferredTransparent" + RenderBinMode = "PostDeferredTransparent", + LatSegments = 19, + LongSegments = 36 + }, Tag = { "nightsky_marking" }, GUI = { diff --git a/data/assets/scene/digitaluniverse/grids.asset b/data/assets/scene/digitaluniverse/grids.asset index 8af69c27e8..8d1c23fe2f 100644 --- a/data/assets/scene/digitaluniverse/grids.asset +++ b/data/assets/scene/digitaluniverse/grids.asset @@ -104,7 +104,7 @@ local EquatorialSphere = { Opacity = 1.0, Color = { 0.3, 0.3, 0.15 }, LineWidth = 2.0, - LatSegments = 17, + LatSegments = 19, LongSegments = 24, }, Tag = { "du_grid" }, @@ -164,7 +164,9 @@ local EclipticSphere = { Enabled = false, Opacity = 1.0, Color = { 0.3, 0.15, 0.15 }, - LineWidth = 2.0 + LineWidth = 2.0, + LatSegments = 19, + LongSegments = 24 }, Tag = { "du_grid" }, GUI = { diff --git a/data/assets/scene/solarsystem/heliosphere/todayssun/grid.asset b/data/assets/scene/solarsystem/heliosphere/todayssun/grid.asset index 91d2326793..804d9bcc4d 100644 --- a/data/assets/scene/solarsystem/heliosphere/todayssun/grid.asset +++ b/data/assets/scene/solarsystem/heliosphere/todayssun/grid.asset @@ -33,7 +33,7 @@ local CarringtonPrimeMeridian = { Color = { 1.0, 0.0, 0.0 }, LineWidth = 2.0, LongSegments = 2, - LatSegments = 31 + LatSegments = 19 }, GUI = { Name = "Carrington Prime Meridian", @@ -63,7 +63,7 @@ local WSA_GridSlice = { Color = { 0.8, 0.8, 0.8 }, LineWidth = 2.0, LongSegments = 2, - LatSegments = 31 + LatSegments = 19 }, GUI = { Name = "Solar Longitude Facing the Earth", @@ -86,8 +86,7 @@ local WSA_Grid10Degrees = { Type = "RenderableSphericalGrid", Size = gridSizeRadius, Color = { 0.035, 0.675, 0.255 }, - LineWidth = 1.0, - Segments = 36 + LineWidth = 1.0 }, GUI = { Name = "Grid on Sun", diff --git a/modules/base/rendering/grids/renderablesphericalgrid.cpp b/modules/base/rendering/grids/renderablesphericalgrid.cpp index 6b78278c5f..668979ab36 100644 --- a/modules/base/rendering/grids/renderablesphericalgrid.cpp +++ b/modules/base/rendering/grids/renderablesphericalgrid.cpp @@ -124,7 +124,7 @@ RenderableSphericalGrid::RenderableSphericalGrid(const ghoul::Dictionary& dictio , _gridProgram(nullptr) , _color(ColorInfo, glm::vec3(0.5f), glm::vec3(0.f), glm::vec3(1.f)) , _longSegments(LongSegmentsInfo, 36, 4, 200) - , _latSegments(LatSegmentsInfo, 18, 4, 200) + , _latSegments(LatSegmentsInfo, 19, 4, 200) , _lineWidth(LineWidthInfo, 0.5f, 1.f, 20.f) { const Parameters p = codegen::bake(dictionary);