Skip to content
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.

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

Directional light and shadow #6

Merged
merged 52 commits into from
Jul 8, 2021
Merged
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
f7b61a3
bevy_pbr2: Add support for most of the StandardMaterial textures
superdump Jun 19, 2021
a7d743f
bevy_pbr2: Ensure RenderCommandQueue is ready for PbrShaders init
superdump Jun 19, 2021
78e7603
texture_pipelined: Add a light to the scene so we can see stuff
superdump Jun 19, 2021
984b9ad
WIP bevy_pbr2: back to front sorting hack
superdump Jun 19, 2021
d2f11bd
bevy_pbr2: Uniform control flow for texture sampling in pbr.frag
superdump Jun 20, 2021
af71877
bevy_pbr2: Simplify texture and sampler names
superdump Jun 20, 2021
4c32a3a
bevy_pbr2: Match default 'AmbientColor' of current bevy_pbr for now
superdump Jun 20, 2021
b5aae65
bevy_pbr2: Convert from non-linear to linear sRGB for the color uniform
superdump Jun 20, 2021
57617b2
bevy_pbr2: Add pbr_pipelined example
superdump Jun 20, 2021
64385dc
Fix view vector in pbr frag to work in ortho
aevyrie Jun 21, 2021
f40c3b9
bevy_pbr2: Use a 90 degree y fov and light range projection for lights
superdump Jun 21, 2021
d41f69a
bevy_pbr2: Add AmbientLight resource
superdump Jun 21, 2021
3965713
bevy_pbr2: Convert PointLight color to linear sRGB for use in fragmen…
superdump Jun 21, 2021
5d1dfb1
bevy_pbr2: pbr.frag: Rename PointLight.projection to view_projection
superdump Jun 21, 2021
dd758b9
bevy_pbr2: PointLight is an OmniLight as it has a radius
superdump Jun 21, 2021
78dcc39
bevy_pbr2: Factoring out duplicated code
superdump Jun 21, 2021
530a938
bevy_pbr2: Add support for DirectionalLight
superdump Jun 21, 2021
6fe9950
bevy_pbr2: Add support for directional light shadows
superdump Jun 22, 2021
57e7ef8
bevy_pbr2: Add a configurable shadow bias min/max to avoid self-shado…
superdump Jun 22, 2021
d7af224
bevy_pbr2: Fix use of both omni and directional lights
superdump Jun 23, 2021
f76ea05
bevy_pbr2: Move directional light's view back to the origin
superdump Jun 23, 2021
fd5b0f3
3d_scene_pipelined: Move the cube to sit on the plane
superdump Jun 23, 2021
8fbdf64
3d_scene_pipelined: Remove material properties that prevent receiving…
superdump Jun 23, 2021
3a9a23e
3d_scene_pipelined: Add more lights and animate the directional light
superdump Jun 23, 2021
b20a500
Merge branch 'pipelined-rendering' into standard-material-textures
superdump Jun 25, 2021
50f01a3
bevy_pbr2: Implement RenderAsset for StandardMaterial
superdump Jun 25, 2021
14829c6
Merge branch 'standard-material-textures' into directional-light-and-…
superdump Jun 25, 2021
a0eb342
Merge branch 'pipelined-rendering' into standard-material-textures
superdump Jun 27, 2021
7cbb00d
Merge branch 'standard-material-textures' into directional-light-and-…
superdump Jun 27, 2021
9f6ef59
Merge branch 'pipelined-rendering' into directional-light-and-shadow
superdump Jun 28, 2021
0633e65
Force main thread for prepare_windows system
TheRawMeatball Jun 29, 2021
f8d96d1
bevy_pbr2: Fix light uniforms
superdump Jun 29, 2021
fba4011
bevy_pbr2: Fix the position outputs from the vertex stage
superdump Jun 29, 2021
0fecd3d
Merge branch 'pipelined-rendering' into directional-light-and-shadow
superdump Jun 29, 2021
3a19a63
Merge branch 'thread-fix' into directional-light-and-shadow
superdump Jun 29, 2021
10819b0
Merge branch 'wgsl-pbr-fixes' into directional-light-and-shadow
superdump Jun 29, 2021
df6074d
Merge branch 'pipelined-rendering' into directional-light-and-shadow
superdump Jun 30, 2021
ff33307
crevice: Add std{140,430}_padded_size_static
superdump Jul 1, 2021
0530368
bevy_render2/bevy_pbr2: Use std140_padded_size_static
superdump Jul 1, 2021
6226865
Merge branch 'crevice-padded-size' into directional-light-and-shadow
superdump Jul 1, 2021
7ed3832
bevy_pbr2: Port directional lights and shadows to wgsl
superdump Jul 1, 2021
bbb9a81
Merge branch 'pipelined-rendering' into directional-light-and-shadow
superdump Jul 2, 2021
baf966c
3d_scene_pipelined: tweak shadow biases for this scene
superdump Jul 2, 2021
b59fa7f
3d_scene_pipelined: Use boxes for walls to avoid light leakage
superdump Jul 2, 2021
14965e7
3d_scene_pipelined: Remove duplicate camera
superdump Jul 2, 2021
4e01e37
Add something resembling the cornell box
superdump Jul 2, 2021
37efe64
cornell_box_pipelined: Improve the ceiling light a little
superdump Jul 2, 2021
98428bb
Revert "Merge branch 'crevice-padded-size' into directional-light-and…
superdump Jul 7, 2021
348adb9
bevy_pbr2: Fix GpuLights min_binding_size
superdump Jul 7, 2021
c6d1d6c
fix rotation
cart Jul 8, 2021
0f9cc99
Use light transform to determine direction and move bias defaults int…
cart Jul 8, 2021
8efae35
simplify examples
cart Jul 8, 2021
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
Prev Previous commit
Next Next commit
bevy_pbr2: Convert from non-linear to linear sRGB for the color uniform
  • Loading branch information
superdump committed Jun 20, 2021
commit b5aae65393031bd5d5a4e64c8de8ffa5abb102a1
2 changes: 1 addition & 1 deletion pipelined/bevy_pbr2/src/material.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ pub fn standard_material_resource_system(
flags |= StandardMaterialFlags::UNLIT;
}
let value = StandardMaterialUniformData {
base_color: material.base_color.into(),
base_color: material.base_color.as_rgba_linear().into(),
emissive: material.emissive.into(),
roughness: material.perceptual_roughness,
metallic: material.metallic,
Expand Down