Skip to content

Fix linear threshold #2628

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
GuoLei1990 merged 2 commits into from
Apr 18, 2025
Merged

Fix linear threshold #2628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc6ef74
fix: merge error
zhuxudong Apr 18, 2025
aa7d499
chore: update e2e
zhuxudong Apr 18, 2025
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
4 changes: 2 additions & 2 deletions e2e/case/postProcess-HDR-bloom-ACES.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
const tonemappingEffect = postProcess.addEffect(TonemappingEffect);
tonemappingEffect.mode.value = TonemappingMode.ACES;

bloomEffect.threshold.value = 0.5;
bloomEffect.intensity.value = 1;
bloomEffect.threshold.value = 1.5;
bloomEffect.intensity.value = 10;

Check warning on line 22 in e2e/case/postProcess-HDR-bloom-ACES.ts

View check run for this annotation

Codecov / codecov/patch

e2e/case/postProcess-HDR-bloom-ACES.ts#L21-L22 

Added lines #L21 - L22 were not covered by tests
bloomEffect.dirtTexture.value = dirtTexture;
tonemappingEffect.mode.value = TonemappingMode.ACES;
});
4 changes: 2 additions & 2 deletions e2e/fixtures/originImage/PostProcess_postProcess-HDR-bloom-ACES.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/core/src/postProcess/PostProcessUberPass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export class PostProcessUberPass extends PostProcessPass {
const thresholdKnee = thresholdLinear * 0.5; // Hardcoded soft knee
const bloomParams = bloomShaderData.getVector4(BloomEffect._bloomParams);
const scatterLerp = MathUtil.lerp(0.05, 0.95, scatter.value);
bloomParams.x = threshold.value;
bloomParams.x = thresholdLinear;
bloomParams.y = thresholdKnee;
bloomParams.z = scatterLerp;
const bloomIntensityParams = uberShaderData.getVector4(BloomEffect._bloomIntensityParams);
Expand Down
Loading