Skip to content

Commit

Permalink
Introduce support for mixed lighting by allowing lights to opt out of
Browse files Browse the repository at this point in the history
illuminating lightmapped objects.

This should be fully working, but it needs some better documentation and
a little polish on the example, so I'm marking it as a draft for now.
  • Loading branch information
pcwalton committed Dec 11, 2024
1 parent 5f1e114 commit 94a8bd0
Show file tree
Hide file tree
Showing 36 changed files with 1,516 additions and 6 deletions.
11 changes: 11 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3849,6 +3849,17 @@ description = "Demonstrates percentage-closer soft shadows (PCSS)"
category = "3D Rendering"
wasm = false

[[example]]
name = "mixed_lighting"
path = "examples/3d/mixed_lighting.rs"
doc-scrape-examples = true

[package.metadata.example.mixed_lighting]
name = "Mixed lighting"
description = "Demonstrates how to combine baked and dynamic lighting"
category = "3D Rendering"
wasm = true

[[example]]
name = "animated_ui"
path = "examples/animation/animated_ui.rs"
Expand Down
Binary file added assets/lightmaps/MixedLightingExample.zstd.ktx2
Binary file not shown.
Binary file added assets/models/MixedLightingExample/Image_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/models/MixedLightingExample/Image_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/models/MixedLightingExample/Image_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/models/MixedLightingExample/Image_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/models/MixedLightingExample/Image_5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/models/MixedLightingExample/Image_6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading

0 comments on commit 94a8bd0

Please sign in to comment.