Skip to content

fix decal index selection in light textures #22267

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

Open
ChristopherBiscardi wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −3
Open

fix decal index selection in light textures #22267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions crates/bevy_pbr/src/render/pbr_lighting.wgsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ fn point_light(
let relative_position = (view_bindings::clustered_decals.decals[(*light).decal_index].local_from_world * vec4(P, 1.0)).xyz;
let cubemap_type = view_bindings::clustered_decals.decals[(*light).decal_index].tag;
let decal_uv = cubemap_uv(relative_position, cubemap_type);
let image_index = view_bindings::clustered_decals.decals[(*light).decal_index].image_index;
let image_index = view_bindings::clustered_decals.decals[(*light).decal_index].base_color_texture_index;

texture_sample = textureSampleLevel(
view_bindings::clustered_decal_textures[image_index],
Expand Down Expand Up @@ -759,7 +759,7 @@ fn spot_light(
vec4((*input).P, 1.0)).xyz;
if local_position.z < 0.0 {
let decal_uv = (local_position.xy / (local_position.z * (*light).spot_light_tan_angle)) * vec2(-0.5, 0.5) + 0.5;
let image_index = view_bindings::clustered_decals.decals[(*light).decal_index].image_index;
let image_index = view_bindings::clustered_decals.decals[(*light).decal_index].base_color_texture_index;

texture_sample = textureSampleLevel(
view_bindings::clustered_decal_textures[image_index],
Expand Down Expand Up @@ -840,7 +840,7 @@ fn directional_light(
if (view_bindings::clustered_decals.decals[(*light).decal_index].tag != 0u)
|| all(clamp(decal_uv, vec2(0.0), vec2(1.0)) == decal_uv)
{
let image_index = view_bindings::clustered_decals.decals[(*light).decal_index].image_index;
let image_index = view_bindings::clustered_decals.decals[(*light).decal_index].base_color_texture_index;

texture_sample = textureSampleLevel(
view_bindings::clustered_decal_textures[image_index],
Expand Down