mirror of
https://github.com/griffi-gh/kubi.git
synced 2024-11-22 06:48:43 -06:00
temporary fix: make all workloads sequential :/
This commit is contained in:
parent
7bc81fc72a
commit
b96d57326f
|
@ -90,5 +90,5 @@ pub fn update_block_placement() -> Workload {
|
||||||
(
|
(
|
||||||
pick_block_with_number_keys,
|
pick_block_with_number_keys,
|
||||||
block_placement_system
|
block_placement_system
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,5 +39,5 @@ pub fn compute_cameras() -> Workload {
|
||||||
(
|
(
|
||||||
update_matrices,
|
update_matrices,
|
||||||
update_frustum,
|
update_frustum,
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,5 +44,5 @@ pub fn update_matrices() -> Workload {
|
||||||
(
|
(
|
||||||
update_view_matrix,
|
update_view_matrix,
|
||||||
update_perspective_matrix.run_if(need_perspective_calc),
|
update_perspective_matrix.run_if(need_perspective_calc),
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@ pub fn update_controllers() -> Workload {
|
||||||
(
|
(
|
||||||
update_look,
|
update_look,
|
||||||
update_movement
|
update_movement
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
|
|
||||||
const MAX_PITCH: f32 = PI/2. - 0.05;
|
const MAX_PITCH: f32 = PI/2. - 0.05;
|
||||||
|
|
|
@ -50,13 +50,13 @@ pub fn init_gui(
|
||||||
pub fn update_gui() -> Workload {
|
pub fn update_gui() -> Workload {
|
||||||
(
|
(
|
||||||
update_gui_view
|
update_gui_view
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn render_gui() -> Workload {
|
pub fn render_gui() -> Workload {
|
||||||
(
|
(
|
||||||
render_progressbars
|
render_progressbars
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
|
|
||||||
// pub fn gui_testing(
|
// pub fn gui_testing(
|
||||||
|
|
|
@ -134,5 +134,5 @@ pub fn process_inputs() -> Workload {
|
||||||
update_input_state,
|
update_input_state,
|
||||||
update_input_state_gamepad,
|
update_input_state_gamepad,
|
||||||
input_end,
|
input_end,
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
|
|
|
@ -100,5 +100,5 @@ pub fn update_loading_screen() -> Workload {
|
||||||
override_loading,
|
override_loading,
|
||||||
switch_to_ingame_if_loaded,
|
switch_to_ingame_if_loaded,
|
||||||
despawn_loading_screen_if_switching_state.run_if(is_changing_state),
|
despawn_loading_screen_if_switching_state.run_if(is_changing_state),
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,7 +99,7 @@ fn startup() -> Workload {
|
||||||
init_gui,
|
init_gui,
|
||||||
insert_control_flow_unique,
|
insert_control_flow_unique,
|
||||||
init_delta_time,
|
init_delta_time,
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
fn update() -> Workload {
|
fn update() -> Workload {
|
||||||
(
|
(
|
||||||
|
@ -117,26 +117,26 @@ fn update() -> Workload {
|
||||||
).into_sequential_workload().run_if(is_multiplayer).tag("networking"),
|
).into_sequential_workload().run_if(is_multiplayer).tag("networking"),
|
||||||
(
|
(
|
||||||
switch_to_loading_if_connected
|
switch_to_loading_if_connected
|
||||||
).into_workload().run_if(is_connecting),
|
).into_sequential_workload(/*into_workload*/).run_if(is_connecting),
|
||||||
(
|
(
|
||||||
update_loading_screen,
|
update_loading_screen,
|
||||||
).into_workload().run_if(is_loading),
|
).into_sequential_workload(/*into_workload*/).run_if(is_loading),
|
||||||
(
|
(
|
||||||
update_loaded_world_around_player,
|
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,
|
update_controllers,
|
||||||
generate_move_events,
|
generate_move_events,
|
||||||
update_raycasts,
|
update_raycasts,
|
||||||
update_block_placement,
|
update_block_placement,
|
||||||
apply_queued_blocks,
|
apply_queued_blocks,
|
||||||
).into_workload().run_if(is_ingame),
|
).into_sequential_workload(/*into_workload*/).run_if(is_ingame),
|
||||||
compute_cameras,
|
compute_cameras,
|
||||||
update_gui,
|
update_gui,
|
||||||
update_state,
|
update_state,
|
||||||
exit_on_esc,
|
exit_on_esc,
|
||||||
disconnect_on_exit.run_if(is_multiplayer),
|
disconnect_on_exit.run_if(is_multiplayer),
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
fn render() -> Workload {
|
fn render() -> Workload {
|
||||||
(
|
(
|
||||||
|
@ -152,7 +152,7 @@ fn render() -> Workload {
|
||||||
fn after_frame_end() -> Workload {
|
fn after_frame_end() -> Workload {
|
||||||
(
|
(
|
||||||
clear_events,
|
clear_events,
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(all(windows, not(debug_assertions)))]
|
#[cfg(all(windows, not(debug_assertions)))]
|
||||||
|
|
|
@ -114,10 +114,10 @@ pub fn update_networking() -> Workload {
|
||||||
(
|
(
|
||||||
set_client_join_state_to_connected,
|
set_client_join_state_to_connected,
|
||||||
say_hello,
|
say_hello,
|
||||||
).into_workload().run_if(if_just_connected),
|
).into_sequential_workload(/*into_workload*/).run_if(if_just_connected),
|
||||||
(
|
(
|
||||||
check_server_hello_response,
|
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
|
).into_sequential_workload() //HACK Weird issues with shipyard removed
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,5 +23,5 @@ pub fn init_primitives() -> Workload {
|
||||||
(
|
(
|
||||||
init_cube_primitive,
|
init_cube_primitive,
|
||||||
init_rect_primitive,
|
init_rect_primitive,
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@ pub fn update_loaded_world_around_player() -> Workload {
|
||||||
unload_downgrade_chunks,
|
unload_downgrade_chunks,
|
||||||
start_required_tasks,
|
start_required_tasks,
|
||||||
process_completed_tasks,
|
process_completed_tasks,
|
||||||
).into_workload()
|
).into_sequential_workload(/*into_workload*/)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update_chunks_if_player_moved(
|
pub fn update_chunks_if_player_moved(
|
||||||
|
|
Loading…
Reference in a new issue