Skip to content

revert: "fix(dynamic cubemap): blend native cubemap fallback"#2369

Merged
alandtse merged 1 commit into
devfrom
revert-2328-fix-dynamic-cubemap
May 18, 2026
Merged

revert: "fix(dynamic cubemap): blend native cubemap fallback"#2369
alandtse merged 1 commit into
devfrom
revert-2328-fix-dynamic-cubemap

Conversation

@doodlum
Copy link
Copy Markdown
Collaborator

@doodlum doodlum commented May 18, 2026

Reverts #2328

Summary by CodeRabbit

  • Bug Fixes

    • Improved reflection fallback behavior in dynamic cubemaps with automatic blend calculation.
    • Removed user-configurable fallback amount setting from the configuration menu.
  • Chores

    • Updated feature version.

Review Change Stack

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 18, 2026

📝 Walkthrough

Walkthrough

ReflectionFallbackAmount setting is completely removed from the DynamicCubemaps feature. Changes cascade from header definitions through C++ implementation and JSON serialization, to shader buffer layout and blend computation, with a corresponding version bump.

Changes

ReflectionFallbackAmount Removal

Layer / File(s) Summary
Remove ReflectionFallbackAmount from Settings struct definition
src/Features/DynamicCubemaps.h
Static constexpr fallback constants (kReflectionFallbackMin, kReflectionFallbackMax, kReflectionFallbackDefault) and the ReflectionFallbackAmount member field with padding are removed from DynamicCubemaps::Settings struct; alignment assertion is deleted.
Remove ReflectionFallbackAmount from C++ implementation
src/Features/DynamicCubemaps.cpp
ReflectionFallbackAmount is removed from JSON serialization mapping, the ImGui "Native Cubemap Fallback" UI slider is deleted from DrawSettings(), and post-load clamping logic is removed from LoadSettings().
Update shader buffer layout and blend computation
package/Shaders/Common/SharedData.hlsli, features/Dynamic Cubemaps/Shaders/DynamicCubemaps/InferCubemapCS.hlsl
CubemapCreatorSettings padding is adjusted from float2 pad0 to float3 pad0 due to EnabledSSR removal; InferCubemapCS blend weight changes from saturate(mipLevel / 7.0) * SharedData::cubemapCreatorSettings.ReflectionFallbackAmount to saturate(mipLevel / 7.0).
Bump feature version
features/Dynamic Cubemaps/Shaders/Features/DynamicCubemaps.ini
Version updated from 2-3-2 to 2-3-1.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~25 minutes

Possibly related PRs

Suggested reviewers

  • alandtse
  • davo0411

Poem

🐰 A cubemap setting bows its head,
ReflectionFallback now gone, no dread.
Mips and mips blend pure and light,
Settings trimmed with shader might. ✨

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Title check ✅ Passed The pull request title accurately describes the main objective: reverting a previous fix related to dynamic cubemap blending.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch revert-2328-fix-dynamic-cubemap

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actions
Copy link
Copy Markdown

No actionable suggestions for changed features.

@github-actions
Copy link
Copy Markdown

✅ A pre-release build is available for this PR:
Download

@alandtse alandtse changed the title fix: revert "fix(dynamic cubemap): blend native cubemap fallback" revert: "fix(dynamic cubemap): blend native cubemap fallback" May 18, 2026
@alandtse alandtse merged commit fd20066 into dev May 18, 2026
16 checks passed
IgorAlanAlbuquerque pushed a commit to IgorAlanAlbuquerque/skyrim-community-shaders that referenced this pull request May 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants