From f53f019659021affca15e3e0bc1c7b2063e9b6e6 Mon Sep 17 00:00:00 2001 From: griffi-gh Date: Thu, 9 Mar 2023 01:14:53 +0100 Subject: [PATCH] temporary fix: make all workloads sequential :/ --- kubi/src/block_placement.rs | 2 +- kubi/src/camera.rs | 2 +- kubi/src/camera/matrices.rs | 2 +- kubi/src/fly_controller.rs | 2 +- kubi/src/gui.rs | 4 ++-- kubi/src/input.rs | 2 +- kubi/src/loading_screen.rs | 2 +- kubi/src/main.rs | 14 +++++++------- kubi/src/networking.rs | 4 ++-- kubi/src/rendering/primitives.rs | 2 +- kubi/src/world/loading.rs | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/kubi/src/block_placement.rs b/kubi/src/block_placement.rs index 888311c..1a04ca7 100644 --- a/kubi/src/block_placement.rs +++ b/kubi/src/block_placement.rs @@ -90,5 +90,5 @@ pub fn update_block_placement() -> Workload { ( pick_block_with_number_keys, block_placement_system - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } diff --git a/kubi/src/camera.rs b/kubi/src/camera.rs index 3da67c3..1fbdcd9 100644 --- a/kubi/src/camera.rs +++ b/kubi/src/camera.rs @@ -39,5 +39,5 @@ pub fn compute_cameras() -> Workload { ( update_matrices, update_frustum, - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } diff --git a/kubi/src/camera/matrices.rs b/kubi/src/camera/matrices.rs index b6ded27..e95e9b4 100644 --- a/kubi/src/camera/matrices.rs +++ b/kubi/src/camera/matrices.rs @@ -44,5 +44,5 @@ pub fn update_matrices() -> Workload { ( update_view_matrix, update_perspective_matrix.run_if(need_perspective_calc), - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } diff --git a/kubi/src/fly_controller.rs b/kubi/src/fly_controller.rs index 57276cb..9814ec3 100644 --- a/kubi/src/fly_controller.rs +++ b/kubi/src/fly_controller.rs @@ -10,7 +10,7 @@ pub fn update_controllers() -> Workload { ( update_look, update_movement - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } const MAX_PITCH: f32 = PI/2. - 0.05; diff --git a/kubi/src/gui.rs b/kubi/src/gui.rs index e45af3a..52996ed 100644 --- a/kubi/src/gui.rs +++ b/kubi/src/gui.rs @@ -50,13 +50,13 @@ pub fn init_gui( pub fn update_gui() -> Workload { ( update_gui_view - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } pub fn render_gui() -> Workload { ( render_progressbars - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } // pub fn gui_testing( diff --git a/kubi/src/input.rs b/kubi/src/input.rs index fe9fd57..dd58650 100644 --- a/kubi/src/input.rs +++ b/kubi/src/input.rs @@ -134,5 +134,5 @@ pub fn process_inputs() -> Workload { update_input_state, update_input_state_gamepad, input_end, - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } diff --git a/kubi/src/loading_screen.rs b/kubi/src/loading_screen.rs index 550a7db..41a6659 100644 --- a/kubi/src/loading_screen.rs +++ b/kubi/src/loading_screen.rs @@ -100,5 +100,5 @@ pub fn update_loading_screen() -> Workload { override_loading, switch_to_ingame_if_loaded, despawn_loading_screen_if_switching_state.run_if(is_changing_state), - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } diff --git a/kubi/src/main.rs b/kubi/src/main.rs index 8f071fc..863fed2 100644 --- a/kubi/src/main.rs +++ b/kubi/src/main.rs @@ -99,7 +99,7 @@ fn startup() -> Workload { init_gui, insert_control_flow_unique, init_delta_time, - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } fn update() -> Workload { ( @@ -117,26 +117,26 @@ fn update() -> Workload { ).into_sequential_workload().run_if(is_multiplayer).tag("networking"), ( switch_to_loading_if_connected - ).into_workload().run_if(is_connecting), + ).into_sequential_workload(/*into_workload*/).run_if(is_connecting), ( update_loading_screen, - ).into_workload().run_if(is_loading), + ).into_sequential_workload(/*into_workload*/).run_if(is_loading), ( update_loaded_world_around_player, - ).into_workload().run_if(is_ingame_or_loading), + ).into_sequential_workload(/*into_workload*/).run_if(is_ingame_or_loading), ( update_controllers, generate_move_events, update_raycasts, update_block_placement, apply_queued_blocks, - ).into_workload().run_if(is_ingame), + ).into_sequential_workload(/*into_workload*/).run_if(is_ingame), compute_cameras, update_gui, update_state, exit_on_esc, disconnect_on_exit.run_if(is_multiplayer), - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } fn render() -> Workload { ( @@ -152,7 +152,7 @@ fn render() -> Workload { fn after_frame_end() -> Workload { ( clear_events, - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } #[cfg(all(windows, not(debug_assertions)))] diff --git a/kubi/src/networking.rs b/kubi/src/networking.rs index 31450ac..61d096f 100644 --- a/kubi/src/networking.rs +++ b/kubi/src/networking.rs @@ -114,10 +114,10 @@ pub fn update_networking() -> Workload { ( set_client_join_state_to_connected, say_hello, - ).into_workload().run_if(if_just_connected), + ).into_sequential_workload(/*into_workload*/).run_if(if_just_connected), ( check_server_hello_response, - ).into_workload().run_if(is_join_state::<{ClientJoinState::Connected as u8}>) + ).into_sequential_workload(/*into_workload*/).run_if(is_join_state::<{ClientJoinState::Connected as u8}>) ).into_sequential_workload() //HACK Weird issues with shipyard removed } diff --git a/kubi/src/rendering/primitives.rs b/kubi/src/rendering/primitives.rs index 6861b3e..fa68ff1 100644 --- a/kubi/src/rendering/primitives.rs +++ b/kubi/src/rendering/primitives.rs @@ -23,5 +23,5 @@ pub fn init_primitives() -> Workload { ( init_cube_primitive, init_rect_primitive, - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } diff --git a/kubi/src/world/loading.rs b/kubi/src/world/loading.rs index 154782d..89b64f4 100644 --- a/kubi/src/world/loading.rs +++ b/kubi/src/world/loading.rs @@ -28,7 +28,7 @@ pub fn update_loaded_world_around_player() -> Workload { unload_downgrade_chunks, start_required_tasks, process_completed_tasks, - ).into_workload() + ).into_sequential_workload(/*into_workload*/) } pub fn update_chunks_if_player_moved(