Skip to content
Snippets Groups Projects
Unverified Commit e2cdc45b authored by David Sehnal's avatar David Sehnal Committed by GitHub
Browse files

Merge branch 'master' into animation-once-stops

parents 285d3cd9 65310e52
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,7 @@ Note that since we don't clearly distinguish between a public and private interf ...@@ -7,6 +7,7 @@ Note that since we don't clearly distinguish between a public and private interf
## [Unreleased] ## [Unreleased]
- Fix 'once' for animations of systems with many frames - Fix 'once' for animations of systems with many frames
- Better guard against issue (black fringes) with bumpiness in impostors
## [v3.26.0] - 2022-12-04 ## [v3.26.0] - 2022-12-04
......
...@@ -12,7 +12,7 @@ export const apply_light_color = ` ...@@ -12,7 +12,7 @@ export const apply_light_color = `
gl_FragColor = material; gl_FragColor = material;
#else #else
#ifdef bumpEnabled #ifdef bumpEnabled
if (uBumpFrequency > 0.0 && uBumpAmplitude > 0.0) { if (uBumpFrequency > 0.0 && uBumpAmplitude > 0.0 && bumpiness > 0.0) {
normal = perturbNormal(-vViewPosition, normal, fbm(vModelPosition * uBumpFrequency), (uBumpAmplitude * bumpiness) / uBumpFrequency); normal = perturbNormal(-vViewPosition, normal, fbm(vModelPosition * uBumpFrequency), (uBumpAmplitude * bumpiness) / uBumpFrequency);
} }
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment