Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where client_init was not set to None after it finished, use tweaked version of winit to avoid macos link failure in the CI, small comment fixes

Browse Source
This commit is contained in:
Imbris 2020-07-16 20:14:34 -04:00
parent 953773e1d3
commit c8133ded43
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -71,7 +71,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Animals are more effective in combat - Animals are more effective in combat
- Pathfinding is much smoother and pets are cleverer - Pathfinding is much smoother and pets are cleverer
- Animals run/turn at different speeds - Animals run/turn at different speeds
- Updated winit 0.19 -> 0.22 - Updated windowing library (winit 0.19 -> 0.22)
### Removed ### Removed

2
Cargo.lock generated
View File

@ -4958,7 +4958,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]] [[package]]
name = "winit" name = "winit"
version = "0.22.2" version = "0.22.2"
source = "git+https://github.com/rust-windowing/winit.git?rev=6919c2fb2d45dc4063c9ef52a69d857ed30657c7#6919c2fb2d45dc4063c9ef52a69d857ed30657c7" source = "git+https://github.com/Imberflur/winit.git?branch=macos-test#e98133adf2abbfc4368f6c069d0beb2b8b688b42"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"cocoa 0.20.2", "cocoa 0.20.2",

2
Cargo.toml
View File

@ -75,4 +75,4 @@ debug = 1
# cpal conflict fix isn't released yet # cpal conflict fix isn't released yet
[patch.crates-io] [patch.crates-io]
winit = { git = "https://github.com/rust-windowing/winit.git", rev = "6919c2fb2d45dc4063c9ef52a69d857ed30657c7" } winit = { git = "https://github.com/Imberflur/winit.git", branch = "macos-test" }

6
voxygen/examples/character_renderer.rs
View File

@ -1,7 +1,7 @@
// TODO: fix this example when we switch to actively maintained renderering // TODO: Fix this example when we switch to actively maintained rendering
// backend Right now we would have to update `gfx_window_glutin` to work with // backend. Right now we would have to update `gfx_window_glutin` to work with
// the latest version of glutin or we would need to add headless support to // the latest version of glutin or we would need to add headless support to
// `old_school_gfx_glutin_ext` // `old_school_gfx_glutin_ext`.
fn main() { fn main() {
println!("Example temporarily disabled, see the TODO comment for details"); println!("Example temporarily disabled, see the TODO comment for details");

1
voxygen/src/menu/main/mod.rs
View File

@ -65,6 +65,7 @@ impl PlayState for MainMenuState {
// Poll client creation. // Poll client creation.
match self.client_init.as_ref().and_then(|init| init.poll()) { match self.client_init.as_ref().and_then(|init| init.poll()) {
Some(InitMsg::Done(Ok(mut client))) => { Some(InitMsg::Done(Ok(mut client))) => {
self.client_init = None;
self.main_menu_ui.connected(); self.main_menu_ui.connected();
// Register voxygen components / resources // Register voxygen components / resources
crate::ecs::init(client.state_mut().ecs_mut()); crate::ecs::init(client.state_mut().ecs_mut());

2
voxygen/src/run.rs
View File

@ -16,7 +16,7 @@ pub fn run(mut global_state: GlobalState, event_loop: EventLoop) {
debug!(?current_state, "Started game with state"); debug!(?current_state, "Started game with state");
}); });
// Used to ignore every other `MainEvenstCleared` // Used to ignore every other `MainEventsCleared`
// This is a workaround for a bug on macos in which mouse motion events are only // This is a workaround for a bug on macos in which mouse motion events are only
// reported every other cycle of the event loop // reported every other cycle of the event loop
// See: https://github.com/rust-windowing/winit/issues/1418 // See: https://github.com/rust-windowing/winit/issues/1418