Skip to content

Commit e9f753f

Browse files
committed
fix egui color conversion after upgrading
1 parent 83d221c commit e9f753f

File tree

7 files changed

+17
-16
lines changed

7 files changed

+17
-16
lines changed

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/notation_kb/Makefile.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ command = "rustup"
2020
install_crate = {crate_name = "basic-http-server", binary = "basic-http-server", test_arg="--help"}
2121

2222
[tasks.wasm-bindgen-cli]
23-
args = ["install", "--force", "wasm-bindgen-cli", "--version=0.2.69"]
23+
args = ["install", "--force", "wasm-bindgen-cli", "--version=0.2.78"]
2424
command = "cargo"
25-
# install_crate = {crate_name = "wasm-bindgen-cli", version = "0.2.69", binary = "wasm-bindgen", test_arg="--force"}
25+
# install_crate = {crate_name = "wasm-bindgen-cli", version = "0.2.78", binary = "wasm-bindgen", test_arg="--force"}
2626

2727
[tasks.cargo-build-web]
2828
args = ["build", "--target", "wasm32-unknown-unknown", "@@split(CARGO_RELEASE_ARGS, )"]

apps/notation_kb/src/kb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl NotationKnowledgeBase {
4242
mut theme: ResMut<NotationTheme>,
4343
mut evts: EventWriter<AddTabEvent>,
4444
entities: Query<Entity, With<GlobalTransform>>,
45-
viewer_query: Query<(Entity, &Arc<TabViewer>), With<Arc<TabViewer>>>,
45+
viewer_query: Query<(Entity, &TabViewer), With<TabViewer>>,
4646
index: Res<IndexPanel>,
4747
) {
4848
NotationApp::load_tab(&mut commands, &time, &mut windows, &mut state, &mut theme, &mut evts, &entities, &viewer_query, |tab_path| {

apps/notation_kb_cn/Makefile.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ command = "rustup"
2020
install_crate = {crate_name = "basic-http-server", binary = "basic-http-server", test_arg="--help"}
2121

2222
[tasks.wasm-bindgen-cli]
23-
args = ["install", "--force", "wasm-bindgen-cli", "--version=0.2.69"]
23+
args = ["install", "--force", "wasm-bindgen-cli", "--version=0.2.78"]
2424
command = "cargo"
25-
# install_crate = {crate_name = "wasm-bindgen-cli", version = "0.2.69", binary = "wasm-bindgen", test_arg="--force"}
25+
# install_crate = {crate_name = "wasm-bindgen-cli", version = "0.2.78", binary = "wasm-bindgen", test_arg="--force"}
2626

2727
[tasks.cargo-build-web]
2828
args = ["build", "--target", "wasm32-unknown-unknown", "@@split(CARGO_RELEASE_ARGS, )"]

apps/notation_viewer/Makefile.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ command = "rustup"
2020
install_crate = {crate_name = "basic-http-server", binary = "basic-http-server", test_arg="--help"}
2121

2222
[tasks.wasm-bindgen-cli]
23-
args = ["install", "--force", "wasm-bindgen-cli", "--version=0.2.69"]
23+
args = ["install", "--force", "wasm-bindgen-cli", "--version=0.2.78"]
2424
command = "cargo"
25-
# install_crate = {crate_name = "wasm-bindgen-cli", version = "0.2.69", binary = "wasm-bindgen", test_arg="--force"}
25+
# install_crate = {crate_name = "wasm-bindgen-cli", version = "0.2.78", binary = "wasm-bindgen", test_arg="--force"}
2626

2727
[tasks.cargo-build-web]
2828
args = ["build", "--target", "wasm32-unknown-unknown", "@@split(CARGO_RELEASE_ARGS, )"]

apps/notation_viewer_cn/Makefile.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ command = "rustup"
2020
install_crate = {crate_name = "basic-http-server", binary = "basic-http-server", test_arg="--help"}
2121

2222
[tasks.wasm-bindgen-cli]
23-
args = ["install", "--force", "wasm-bindgen-cli", "--version=0.2.69"]
23+
args = ["install", "--force", "wasm-bindgen-cli", "--version=0.2.78"]
2424
command = "cargo"
25-
# install_crate = {crate_name = "wasm-bindgen-cli", version = "0.2.69", binary = "wasm-bindgen", test_arg="--force"}
25+
# install_crate = {crate_name = "wasm-bindgen-cli", version = "0.2.78", binary = "wasm-bindgen", test_arg="--force"}
2626

2727
[tasks.cargo-build-web]
2828
args = ["build", "--target", "wasm32-unknown-unknown", "@@split(CARGO_RELEASE_ARGS, )"]

crates/notation_bevy_utils/src/util/color.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use super::BevyUtil;
55

66
impl BevyUtil {
77
pub fn rgb_to_egui(color: &Color) -> Hsva {
8-
Hsva::from_rgb([color.r(), color.g(), color.b()])
8+
let v = color.as_linear_rgba_f32();
9+
Hsva::from_rgb([v[0], v[1], v[2]])
910
}
1011
}

0 commit comments

Comments
 (0)