Fix some cubemap reflections issues #1311

VReaperV · 2024-09-17T14:14:41Z

Fixes:

Reading data into cubemaps
Texture coordinates on debug probes when using r_showCubeProbes on
Overbright on debug probes
A culling issue when used with the material system
Incorrect texture bind
Colour grading setup for the reflection cubemaps
Also made the highligting of the selected cubemaps use an outline so the contents of the cubemap can still be seen.
Added r_showCubeProbeFace and r_showReflectionMaps for debugging.
Added r_cubeProbeSize to allow for custom reflection cubemap sizes.
Hash epsilon for cubemaps hashTable slightly increased.

See below for screenshots.

The reflections also correctly show up on surfaces (although the cubemap selection is still bad).

src/engine/renderer/glsl_source/reflection_CB_fp.glsl

VReaperV · 2024-09-19T10:55:28Z

Added a fix to stop UI from being rendered into the cubemaps, and added an r_showCubeProbeFace cvar to aid with debugging.

VReaperV · 2024-09-19T10:57:57Z

The cubemaps are pretty much rendered correctly now, however there's some bug with cameraEffects_fp shader's colour grading that results in those images getting completely black in the end. Commenting out that part makes them work correctly. Not sure what the issue with colour grading is yet, the texture itself seems to be correct, and the texture coordinates are based on colour.

VReaperV · 2024-09-19T18:53:06Z

Fixed the issue with colour grading now. This now properly renders cubemaps, the reflections work.

illwieckz · 2024-09-19T19:55:09Z

AMD Radeon PRO W7600 (navi33), Mesa 24.0.9 radeonsi, Linux:

20240919-214537-000.unvanquished-relief-mapping.webm

illwieckz · 2024-09-19T19:58:41Z

I can actually see the reflection:

Of what's behind me:

VReaperV · 2024-09-19T20:02:42Z

Good. This is pr is more less ready, I just wanna see if I can add a couple more settings/debug cvars for this.

illwieckz · 2024-09-19T20:10:03Z

I can clearly recognize what is reflected, good job!

VReaperV · 2024-09-19T20:14:14Z

Thanks! I'll see if I can add a cvar to be able to set the size of reflection cubemaps as well.

VReaperV · 2024-09-19T20:36:52Z

Added a cvar to see only the reflections themselves.

src/engine/renderer/tr_bsp.cpp

VReaperV · 2024-09-19T23:51:23Z

All of these use r_cubeProbeSize 256:

Plat23:

Correct r_showCubeProbes on rendering:

r_showReflectionMaps on:

td:

Vega:

r_showReflectionMaps on:

Usstremor:

r_showReflectionMaps on:

VReaperV · 2024-09-20T00:00:46Z

More screenshots by @illwieckz:

src/engine/renderer/tr_bsp.cpp

This allows seeing the contents of the selected cubemap.

The comment about a bugfix seems to be wrong since: 1. We only run it at 32x32 2. It tries to read out of bounds data, so it was never correct in the first place

VReaperV · 2024-09-22T22:09:54Z

I've added a commit that stops probes from being added in the void. There are still some around patch meshes though. Skies also tend to generate some in unreachable areas, due to how skybrushes are placed.

src/engine/renderer/tr_backend.cpp

src/engine/renderer/tr_bsp.cpp

src/engine/renderer/tr_init.cpp

slipher

Drawing the cubemap images with r_showCubeProbes still doesn't seem quite right. The image can change discontinously with a slight movement and for some reason it's all white a lot of times. I guess it's better than before though

src/engine/renderer/tr_scene.cpp

src/engine/renderer/tr_backend.cpp

VReaperV · 2024-09-24T12:56:12Z

Drawing the cubemap images with r_showCubeProbes still doesn't seem quite right. The image can change discontinously with a slight movement and for some reason it's all white a lot of times. I guess it's better than before though

Yeah, noticed both of that too sometimes, don't know the reason yet though.

Debug option: render from the perspective of a selected face of a cubemap after the static reflections cubemaps are built. The index is a global index, where each 6 consecutive indices correspond to one cubemap; -1: disabled. .

This should help a bit with reflections disappearing until a proper solution is implemented.

Debug cvar to see only what gets reflected. This requires running `/buildcubemaps` *after* `/vid_restart`.

Add a cvar to set static reflections cubemaps size.

slipher

LGTM

src/engine/renderer/tr_scene.cpp

VReaperV added T-Bug A-Renderer labels Sep 17, 2024

illwieckz reviewed Sep 17, 2024

View reviewed changes

src/engine/renderer/glsl_source/reflection_CB_fp.glsl Outdated Show resolved Hide resolved

VReaperV force-pushed the fix-cubemap-reflections branch from 41b1afd to 655ae65 Compare September 17, 2024 21:56

VReaperV force-pushed the fix-cubemap-reflections branch 2 times, most recently from 259ac9a to 3fd7a50 Compare September 19, 2024 18:41

VReaperV force-pushed the fix-cubemap-reflections branch from 763ae70 to d1df0c7 Compare September 19, 2024 21:29

github-advanced-security bot found potential problems Sep 19, 2024

View reviewed changes

src/engine/renderer/tr_bsp.cpp Fixed Show fixed Hide fixed

src/engine/renderer/tr_bsp.cpp Fixed Show fixed Hide fixed

src/engine/renderer/tr_bsp.cpp Fixed Show fixed Hide fixed

src/engine/renderer/tr_bsp.cpp Fixed Show fixed Hide fixed

src/engine/renderer/tr_bsp.cpp Fixed Show fixed Hide fixed

VReaperV force-pushed the fix-cubemap-reflections branch 5 times, most recently from 2400b08 to ed01ebf Compare September 19, 2024 22:49

VReaperV added the T-Improvement Improvement for an existing feature label Sep 19, 2024

VReaperV force-pushed the fix-cubemap-reflections branch from ed01ebf to 75efb6f Compare September 20, 2024 00:08

illwieckz reviewed Sep 20, 2024

View reviewed changes

src/engine/renderer/tr_bsp.cpp Outdated Show resolved Hide resolved

VReaperV force-pushed the fix-cubemap-reflections branch from 75efb6f to 9537561 Compare September 20, 2024 12:20

github-advanced-security bot found potential problems Sep 20, 2024

View reviewed changes

src/engine/renderer/tr_bsp.cpp Fixed Show fixed Hide fixed

VReaperV force-pushed the fix-cubemap-reflections branch from 9537561 to 1a5f2a4 Compare September 20, 2024 12:28

VReaperV force-pushed the fix-cubemap-reflections branch 3 times, most recently from 16ac017 to 065da5e Compare September 20, 2024 14:09

VReaperV added 5 commits September 22, 2024 19:57

Switch r_showCubeProbes to new-style cvar

4431426

Use the correct uniform for reflection_CB and reflcetion_C shaders

a7bd693

Render selected cubeMap with r_showCubeProbes 1 as outline

1d40b33

This allows seeing the contents of the selected cubemap.

Read the correct part of the screen for cubemaps

fe06a2a

The comment about a bugfix seems to be wrong since: 1. We only run it at 32x32 2. It tries to read out of bounds data, so it was never correct in the first place

Fix r_showCubeProbes texture coordinates

2610a4a

VReaperV force-pushed the fix-cubemap-reflections branch from 065da5e to f0fe22c Compare September 22, 2024 16:58

slipher reviewed Sep 22, 2024

View reviewed changes

src/engine/renderer/tr_backend.cpp Outdated Show resolved Hide resolved

src/engine/renderer/tr_bsp.cpp Show resolved Hide resolved

src/engine/renderer/tr_init.cpp Show resolved Hide resolved

VReaperV force-pushed the fix-cubemap-reflections branch from d9f0010 to d3dc97c Compare September 23, 2024 13:05

slipher reviewed Sep 24, 2024

View reviewed changes

src/engine/renderer/tr_scene.cpp Outdated Show resolved Hide resolved

src/engine/renderer/tr_scene.cpp Outdated Show resolved Hide resolved

src/engine/renderer/tr_backend.cpp Outdated Show resolved Hide resolved

VReaperV added 2 commits September 24, 2024 23:43

Fix overbright in cubemap reflection debug render

db3c6e4

Render each cubemap frame twice with material system enabled

97fb80d

VReaperV force-pushed the fix-cubemap-reflections branch from 724f0df to c5a586f Compare September 24, 2024 20:44

VReaperV added 7 commits September 25, 2024 00:01

Add r_showCubeProbeFace

5b1d968

Debug option: render from the perspective of a selected face of a cubemap after the static reflections cubemaps are built. The index is a global index, where each 6 consecutive indices correspond to one cubemap; -1: disabled. .

Set refdef gradingWeights for reflections cubemaps

23b2005

Increase cubemap hash epsilon

d79af9d

This should help a bit with reflections disappearing until a proper solution is implemented.

Add r_showReflectionMaps

56e1899

Debug cvar to see only what gets reflected. This requires running `/buildcubemaps` *after* `/vid_restart`.

Add r_cubeProbeSize

5e1e91b

Add a cvar to set static reflections cubemaps size.

Cleanup R_BuildCubeMaps()

7538e13

Skip empty nodes when placing cubemap probes

a5fbf2b

VReaperV force-pushed the fix-cubemap-reflections branch from c5a586f to 02f0776 Compare September 24, 2024 21:08

slipher reviewed Sep 24, 2024

View reviewed changes

src/engine/renderer/tr_scene.cpp Outdated Show resolved Hide resolved

Add and remove some comments

4da8463

VReaperV force-pushed the fix-cubemap-reflections branch from 02f0776 to 4da8463 Compare September 25, 2024 07:50

VReaperV merged commit 5d689e4 into DaemonEngine:master Sep 25, 2024
9 checks passed

VReaperV deleted the fix-cubemap-reflections branch September 25, 2024 08:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix some cubemap reflections issues #1311

Fix some cubemap reflections issues #1311

VReaperV commented Sep 17, 2024 •

edited

Loading

VReaperV commented Sep 19, 2024

VReaperV commented Sep 19, 2024

VReaperV commented Sep 19, 2024

illwieckz commented Sep 19, 2024

illwieckz commented Sep 19, 2024

VReaperV commented Sep 19, 2024

illwieckz commented Sep 19, 2024

VReaperV commented Sep 19, 2024

VReaperV commented Sep 19, 2024

VReaperV commented Sep 19, 2024 •

edited

Loading

VReaperV commented Sep 20, 2024

VReaperV commented Sep 22, 2024

slipher left a comment

VReaperV commented Sep 24, 2024

slipher left a comment

Fix some cubemap reflections issues #1311

Fix some cubemap reflections issues #1311

Conversation

VReaperV commented Sep 17, 2024 • edited Loading

VReaperV commented Sep 19, 2024

VReaperV commented Sep 19, 2024

VReaperV commented Sep 19, 2024

illwieckz commented Sep 19, 2024

illwieckz commented Sep 19, 2024

VReaperV commented Sep 19, 2024

illwieckz commented Sep 19, 2024

VReaperV commented Sep 19, 2024

VReaperV commented Sep 19, 2024

VReaperV commented Sep 19, 2024 • edited Loading

VReaperV commented Sep 20, 2024

VReaperV commented Sep 22, 2024

slipher left a comment

Choose a reason for hiding this comment

VReaperV commented Sep 24, 2024

slipher left a comment

Choose a reason for hiding this comment

VReaperV commented Sep 17, 2024 •

edited

Loading

VReaperV commented Sep 19, 2024 •

edited

Loading