Skip to content

Fix sky being added when rendering lowers sliced against 3d sectors #1798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nstlaurent merged 6 commits into from
Sep 19, 2026
+4 −3
Merged

Fix sky being added when rendering lowers sliced against 3d sectors #1798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c0dd328
clear SkyGeometry on reset. StaticCacheGeometryRenderer will readd th…
nstlaurent Sep 15, 2026
f592dd0
fix typo
nstlaurent Sep 15, 2026
7cf3d0d
correct size of type (#1789)
nstlaurent Sep 15, 2026
ecbdb4e
Sky render fixes (#1794)
nstlaurent Sep 17, 2026
7f46b61
do not render sky sides when rendering sliced 3d lowers
nstlaurent Sep 19, 2026
6128c88
Merge branch 'sky-lower-3d-fix' into dev-sky-lower-3d-fix
nstlaurent Sep 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Core/Render/OpenGL/Renderers/Legacy/World/Geometry/GeometryRenderer.Sector3D.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,8 @@ public RenderWallSliceResult RenderTwoSidedLowerSlice(RenderWallSliceArgs args)
if (!SetSectorsForTwoSidedLowerSlice(args, out var facing, out var other))
return RenderWallSliceResult.EmptyNoAddOffset;

RenderTwoSidedLower(args.Side, args.OtherSide, facing, other, args.IsFrontSide, out var sideVertices, out var skyVertices, out var skyVertices2, lightLevelSector: args.LightSector);
RenderTwoSidedLower(args.Side, args.OtherSide, facing, other, args.IsFrontSide, out var sideVertices, out var skyVertices, out var skyVertices2,
lightLevelSector: args.LightSector, renderSkySide: args.RenderSkySide);
return new(sideVertices, skyVertices, null, skyVertices2);
}

Expand Down
2 changes: 1 addition & 1 deletion Core/Render/OpenGL/Renderers/Legacy/World/Geometry/GeometryRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,7 +1013,7 @@ private void RenderTwoSided(Side facingSide, bool isFrontSide)
if ((visibility & SideTexture.Lower) != 0)
{
if (renderSlices3D)
RenderWallSlices3D(facingSide, facingSide.Lower, isFrontSide, otherSide, facingSector, otherSector, facingSide.Sector.SectorPlanes3D, m_renderTwoSidedLowerSliceFunc);
RenderWallSlices3D(facingSide, facingSide.Lower, isFrontSide, otherSide, facingSector, otherSector, facingSide.Sector.SectorPlanes3D, m_renderTwoSidedLowerSliceFunc, renderSkySide: false);
else
RenderTwoSidedLower(facingSide, otherSide, facingSector, otherSector, isFrontSide, out _, out _, out _);
}
Expand Down
2 changes: 1 addition & 1 deletion Core/Render/OpenGL/Renderers/Legacy/World/Geometry/Static/StaticCacheGeometryRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ private void AddTwoSided(Side side, bool isFrontSide, bool update, bool fogBarri
RenderWallSliceResult result;
if (side.Sector.Sectors3D.Length > 0)
{
result = m_geometryRenderer.RenderWallSlices3D(side, side.Lower, isFrontSide, otherSide, facingSector, otherSector, side.Sector.SectorPlanes3D, m_renderTwoSidedLowerSliceFunc);
result = m_geometryRenderer.RenderWallSlices3D(side, side.Lower, isFrontSide, otherSide, facingSector, otherSector, side.Sector.SectorPlanes3D, m_renderTwoSidedLowerSliceFunc, renderSkySide: false);
}
else
{
Expand Down
Loading