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

Enhance bevy_render::color with palette #9698

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a17cfd8
Initial Implementation of Palette
bushrat011899 Sep 4, 2023
3539531
WIP
bushrat011899 Sep 4, 2023
1276e82
Merge remote-tracking branch 'upstream/main' into ReplaceColorWithPal…
ZacHarroldC5 Sep 5, 2023
f464deb
Added `lighten`, `darken`, `mix` Methods
ZacHarroldC5 Sep 5, 2023
6a09348
Clarified Hue Bounds
ZacHarroldC5 Sep 5, 2023
4b3fec2
Fixed Naive `f32` Unit Test
ZacHarroldC5 Sep 5, 2023
eeef290
Merge remote-tracking branch 'upstream/main' into ReplaceColorWithPal…
ZacHarroldC5 Sep 5, 2023
378d3ca
Added Hue and Saturation Modifiers
ZacHarroldC5 Sep 6, 2023
4fa26d4
Fixed Typos and Ambiguities; Added `from_space` as `in_space` Inverse
ZacHarroldC5 Sep 6, 2023
a6bc67b
Documenting Bounds and Expected Conversions
ZacHarroldC5 Sep 6, 2023
1a12d66
Fixed Formatting and Re-Exported `palette` Properly
ZacHarroldC5 Sep 6, 2023
e5535d3
Fixed Excessive Precision in Test
ZacHarroldC5 Sep 6, 2023
f5a2844
Merge remote-tracking branch 'upstream/main' into ReplaceColorWithPal…
bushrat011899 Sep 6, 2023
a7f6ca1
Added hue getter and setter, Documentation
bushrat011899 Sep 7, 2023
3a2eaf0
Updated `deny.toml`
bushrat011899 Sep 7, 2023
051fc87
Merge remote-tracking branch 'upstream/main' into ReplaceColorWithPal…
bushrat011899 Sep 7, 2023
7db9835
Added `difference_in` for CIEDE2000 Color Comparison
bushrat011899 Sep 13, 2023
1383560
Fixed `wgpu` Conversion
bushrat011899 Sep 18, 2023
7cbf5b9
Fixed `as_rgb_u8`
bushrat011899 Sep 18, 2023
d75c750
Replaced `PackedRgba` methods with `Srgb(a)<u8>`
bushrat011899 Sep 18, 2023
49f5752
Fixed Typo in Doc Test
bushrat011899 Sep 18, 2023
c794e92
Fixed Typo for "color space"
bushrat011899 Sep 18, 2023
996e86d
Added `perceptually_eq` Method
bushrat011899 Sep 18, 2023
9cecc98
Added Color Mixing Example
bushrat011899 Sep 25, 2023
4544e76
Reverted Changes to `deny.toml`
bushrat011899 Sep 25, 2023
661cdb1
Merge remote-tracking branch 'upstream/main' into ReplaceColorWithPal…
bushrat011899 Nov 10, 2023
5025ecf
Merge remote-tracking branch 'upstream/main' into ReplaceColorWithPal…
bushrat011899 Nov 30, 2023
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
11 changes: 11 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2136,6 +2136,17 @@ description = "Illustrates creating and updating a button"
category = "UI (User Interface)"
wasm = true

[[example]]
name = "color_mixing"
path = "examples/ui/color_mixing.rs"
doc-scrape-examples = true

[package.metadata.example.color_mixing]
name = "Color Mixing"
description = "Demonstrates color mixing in different spaces"
category = "UI (User Interface)"
wasm = true

[[example]]
name = "display_and_visibility"
path = "examples/ui/display_and_visibility.rs"
Expand Down
6 changes: 3 additions & 3 deletions crates/bevy_gltf/src/loader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@ fn load_node(
gltf::khr_lights_punctual::Kind::Directional => {
let mut entity = parent.spawn(DirectionalLightBundle {
directional_light: DirectionalLight {
color: Color::rgb_from_array(light.color()),
color: Color::from(light.color()),
// NOTE: KHR_punctual_lights defines the intensity units for directional
// lights in lux (lm/m^2) which is what we need.
illuminance: light.intensity(),
Expand All @@ -1068,7 +1068,7 @@ fn load_node(
gltf::khr_lights_punctual::Kind::Point => {
let mut entity = parent.spawn(PointLightBundle {
point_light: PointLight {
color: Color::rgb_from_array(light.color()),
color: Color::from(light.color()),
// NOTE: KHR_punctual_lights defines the intensity units for point lights in
// candela (lm/sr) which is luminous intensity and we need luminous power.
// For a point light, luminous power = 4 * pi * luminous intensity
Expand All @@ -1094,7 +1094,7 @@ fn load_node(
} => {
let mut entity = parent.spawn(SpotLightBundle {
spot_light: SpotLight {
color: Color::rgb_from_array(light.color()),
color: Color::from(light.color()),
// NOTE: KHR_punctual_lights defines the intensity units for spot lights in
// candela (lm/sr) which is luminous intensity and we need luminous power.
// For a spot light, we map luminous power = 4 * pi * luminous intensity
Expand Down
1 change: 1 addition & 0 deletions crates/bevy_render/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ profiling = { version = "1", features = [
"profile-with-tracing",
], optional = true }
async-channel = "1.8"
palette = { version = "0.7.3", features = ["serializing"] }

[target.'cfg(target_arch = "wasm32")'.dependencies]
js-sys = "0.3"
Expand Down
Loading
Loading