From 4bf58279e89dbfe4a375780fb7ef5ce82ee0ad7d Mon Sep 17 00:00:00 2001 From: Jay Oster Date: Wed, 17 Aug 2022 17:33:42 -0700 Subject: [PATCH 1/3] Update winit 0.27 Closes #292 TODO examples: - [x] `conway` - [x] `custom-shader` - [ ] `imgui-winit` - TBD: `imgui-winit-support` needs to be updated. See: https://github.com/imgui-rs/imgui-rs/pull/659 - TBD: `imgui-wgpu` needs to be updated (No PR yet) - [ ] `invaders` - TBD: `game-loop` needs to be updated. (No PR yet) - [x] `minimal-egui` - [x] `minimal-web` - [x] `minimal-winit` - [x] `raqote-winit` --- Cargo.toml | 2 +- examples/conway/Cargo.toml | 4 ++-- examples/custom-shader/Cargo.toml | 4 ++-- examples/minimal-egui/Cargo.toml | 10 +++++----- examples/minimal-web/Cargo.toml | 4 ++-- examples/minimal-winit/Cargo.toml | 4 ++-- examples/raqote-winit/Cargo.toml | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 662fd21d..7a467921 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ pollster = "0.2" [dev-dependencies] pixels-mocks = { path = "internals/pixels-mocks" } -winit = "0.26" +winit = "0.27" [workspace] members = [ diff --git a/examples/conway/Cargo.toml b/examples/conway/Cargo.toml index 548917b2..6e0e87da 100644 --- a/examples/conway/Cargo.toml +++ b/examples/conway/Cargo.toml @@ -17,5 +17,5 @@ line_drawing = "1.0" log = "0.4" pixels = { path = "../.." } randomize = "3.0" -winit = "0.26" -winit_input_helper = "0.12" +winit = "0.27" +winit_input_helper = "0.13" diff --git a/examples/custom-shader/Cargo.toml b/examples/custom-shader/Cargo.toml index 44b5baed..f0f3f602 100644 --- a/examples/custom-shader/Cargo.toml +++ b/examples/custom-shader/Cargo.toml @@ -14,5 +14,5 @@ bytemuck = "1.10" env_logger = "0.9" log = "0.4" pixels = { path = "../.." } -winit = "0.26" -winit_input_helper = "0.12" +winit = "0.27" +winit_input_helper = "0.13" diff --git a/examples/minimal-egui/Cargo.toml b/examples/minimal-egui/Cargo.toml index b1cc529d..2e4d2745 100644 --- a/examples/minimal-egui/Cargo.toml +++ b/examples/minimal-egui/Cargo.toml @@ -10,11 +10,11 @@ optimize = ["log/release_max_level_warn"] default = ["optimize"] [dependencies] -egui = { git = "https://github.com/emilk/egui.git", rev = "38a67f86467f16084443258ae5e7761429c00db2" } -egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "38a67f86467f16084443258ae5e7761429c00db2" } -egui-winit = { git = "https://github.com/emilk/egui.git", rev = "38a67f86467f16084443258ae5e7761429c00db2", default-features = false, features = ["links"] } +egui = { git = "https://github.com/emilk/egui.git", rev = "eeeb4b7de2d08b7923a0e19cf1a711b7219afa1f" } +egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "eeeb4b7de2d08b7923a0e19cf1a711b7219afa1f" } +egui-winit = { git = "https://github.com/emilk/egui.git", rev = "eeeb4b7de2d08b7923a0e19cf1a711b7219afa1f", default-features = false, features = ["links"] } env_logger = "0.9" log = "0.4" pixels = { path = "../.." } -winit = "0.26" -winit_input_helper = "0.12" +winit = "0.27" +winit_input_helper = "0.13" diff --git a/examples/minimal-web/Cargo.toml b/examples/minimal-web/Cargo.toml index 7caba527..56d1e1b2 100644 --- a/examples/minimal-web/Cargo.toml +++ b/examples/minimal-web/Cargo.toml @@ -14,8 +14,8 @@ default = ["optimize"] log = "0.4" pixels = { path = "../.." } wgpu = "0.13" -winit = "0.26" -winit_input_helper = "0.12" +winit = "0.27" +winit_input_helper = "0.13" [target.'cfg(target_arch = "wasm32")'.dependencies] console_error_panic_hook = "0.1" diff --git a/examples/minimal-winit/Cargo.toml b/examples/minimal-winit/Cargo.toml index a8692883..73b5f308 100644 --- a/examples/minimal-winit/Cargo.toml +++ b/examples/minimal-winit/Cargo.toml @@ -13,5 +13,5 @@ default = ["optimize"] env_logger = "0.9" log = "0.4" pixels = { path = "../.." } -winit = "0.26" -winit_input_helper = "0.12" +winit = "0.27" +winit_input_helper = "0.13" diff --git a/examples/raqote-winit/Cargo.toml b/examples/raqote-winit/Cargo.toml index c559afcb..afa8a4d6 100644 --- a/examples/raqote-winit/Cargo.toml +++ b/examples/raqote-winit/Cargo.toml @@ -14,8 +14,8 @@ env_logger = "0.9" euclid = "0.22" log = "0.4" pixels = { path = "../.." } -winit = "0.26" -winit_input_helper = "0.12" +winit = "0.27" +winit_input_helper = "0.13" [dependencies.raqote] git = "https://github.com/jrmuizel/raqote.git" From 23ac3558bd463b2c01b9f5b3a325db6f39b55906 Mon Sep 17 00:00:00 2001 From: Jay Oster Date: Mon, 22 Aug 2022 09:56:13 -0700 Subject: [PATCH 2/3] Update egui --- examples/minimal-egui/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/minimal-egui/Cargo.toml b/examples/minimal-egui/Cargo.toml index 2e4d2745..168d6449 100644 --- a/examples/minimal-egui/Cargo.toml +++ b/examples/minimal-egui/Cargo.toml @@ -10,9 +10,9 @@ optimize = ["log/release_max_level_warn"] default = ["optimize"] [dependencies] -egui = { git = "https://github.com/emilk/egui.git", rev = "eeeb4b7de2d08b7923a0e19cf1a711b7219afa1f" } -egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "eeeb4b7de2d08b7923a0e19cf1a711b7219afa1f" } -egui-winit = { git = "https://github.com/emilk/egui.git", rev = "eeeb4b7de2d08b7923a0e19cf1a711b7219afa1f", default-features = false, features = ["links"] } +egui = "0.19" +egui-wgpu = "0.19" +egui-winit = { version = "0.19", default-features = false, features = ["links"] } env_logger = "0.9" log = "0.4" pixels = { path = "../.." } From b3f2ead7470678d92101998e9c12823430b63472 Mon Sep 17 00:00:00 2001 From: Jay Oster Date: Sat, 1 Oct 2022 13:59:51 -0700 Subject: [PATCH 3/3] Update game-loop --- examples/invaders/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/invaders/Cargo.toml b/examples/invaders/Cargo.toml index 63a78ee4..7a1aba8b 100644 --- a/examples/invaders/Cargo.toml +++ b/examples/invaders/Cargo.toml @@ -12,12 +12,12 @@ default = ["optimize"] [dependencies] byteorder = "1.3" env_logger = "0.9" -game-loop = { version = "0.9", features = ["window"] } +game-loop = { version = "0.10", features = ["winit"] } getrandom = "0.2" gilrs = "0.9" log = "0.4" pixels = { path = "../.." } randomize = "3.0" simple-invaders = { path = "simple-invaders" } -winit = "0.26" -winit_input_helper = "0.12" +winit = "0.27" +winit_input_helper = "0.13"