2019-01-11 23:18:34 +00:00
|
|
|
use crate::{
|
2020-01-10 00:33:38 +00:00
|
|
|
ecs::MyEntity,
|
2019-05-23 09:30:46 +00:00
|
|
|
hud::{DebugInfo, Event as HudEvent, Hud},
|
2020-02-01 20:39:39 +00:00
|
|
|
i18n::{i18n_asset_key, VoxygenLocalization},
|
2019-03-02 03:48:30 +00:00
|
|
|
key_state::KeyState,
|
2020-03-08 20:31:27 +00:00
|
|
|
menu::char_selection::CharSelectionState,
|
2019-01-11 23:18:34 +00:00
|
|
|
render::Renderer,
|
2020-02-29 03:59:11 +00:00
|
|
|
scene::{camera, Scene, SceneData},
|
2020-03-10 21:00:13 +00:00
|
|
|
window::{AnalogGameInput, Event, GameInput},
|
2019-04-29 20:37:19 +00:00
|
|
|
Direction, Error, GlobalState, PlayState, PlayStateResult,
|
2019-01-11 23:18:34 +00:00
|
|
|
};
|
2019-11-06 21:36:39 +00:00
|
|
|
use client::{self, Client, Event::Chat};
|
2019-08-06 21:51:13 +00:00
|
|
|
use common::{
|
2020-02-01 20:39:39 +00:00
|
|
|
assets::{load_watched, watch},
|
2019-08-14 21:28:37 +00:00
|
|
|
clock::Clock,
|
|
|
|
comp,
|
2020-03-10 20:50:04 +00:00
|
|
|
comp::{Pos, Vel, MAX_PICKUP_RANGE_SQR},
|
2019-08-14 21:28:37 +00:00
|
|
|
msg::ClientState,
|
|
|
|
terrain::{Block, BlockKind},
|
|
|
|
vol::ReadVol,
|
2019-10-17 05:14:20 +00:00
|
|
|
ChatType,
|
2019-08-06 21:51:13 +00:00
|
|
|
};
|
2019-07-26 02:28:53 +00:00
|
|
|
use log::error;
|
2019-11-30 06:41:20 +00:00
|
|
|
use specs::{Join, WorldExt};
|
2019-06-06 14:48:41 +00:00
|
|
|
use std::{cell::RefCell, rc::Rc, time::Duration};
|
2019-05-09 17:58:16 +00:00
|
|
|
use vek::*;
|
2019-01-11 23:18:34 +00:00
|
|
|
|
2020-03-08 08:06:22 +00:00
|
|
|
/// The action to perform after a tick
|
|
|
|
enum TickAction {
|
|
|
|
// Continue executing
|
|
|
|
Continue,
|
|
|
|
// Disconnected (i.e. go to main menu)
|
|
|
|
Disconnect,
|
|
|
|
}
|
|
|
|
|
2019-01-11 23:18:34 +00:00
|
|
|
pub struct SessionState {
|
|
|
|
scene: Scene,
|
2019-04-04 14:45:57 +00:00
|
|
|
client: Rc<RefCell<Client>>,
|
2019-03-15 04:55:52 +00:00
|
|
|
hud: Hud,
|
2019-06-09 14:20:20 +00:00
|
|
|
key_state: KeyState,
|
2019-10-15 04:06:14 +00:00
|
|
|
inputs: comp::ControllerInputs,
|
2019-07-04 19:59:57 +00:00
|
|
|
selected_block: Block,
|
2019-01-11 23:18:34 +00:00
|
|
|
}
|
|
|
|
|
2019-05-17 09:22:32 +00:00
|
|
|
/// Represents an active game session (i.e., the one being played).
|
2019-01-11 23:18:34 +00:00
|
|
|
impl SessionState {
|
2019-05-17 09:22:32 +00:00
|
|
|
/// Create a new `SessionState`.
|
2019-07-26 02:28:53 +00:00
|
|
|
pub fn new(global_state: &mut GlobalState, client: Rc<RefCell<Client>>) -> Self {
|
2020-02-01 20:39:39 +00:00
|
|
|
// Create a scene for this session. The scene handles visible elements of the
|
|
|
|
// game world.
|
2019-08-05 16:37:52 +00:00
|
|
|
let mut scene = Scene::new(global_state.window.renderer_mut());
|
2019-08-05 16:47:07 +00:00
|
|
|
scene
|
|
|
|
.camera_mut()
|
|
|
|
.set_fov_deg(global_state.settings.graphics.fov);
|
2019-10-16 11:39:41 +00:00
|
|
|
let hud = Hud::new(global_state, &client.borrow());
|
2020-01-10 00:33:38 +00:00
|
|
|
{
|
|
|
|
let my_entity = client.borrow().entity();
|
|
|
|
client
|
|
|
|
.borrow_mut()
|
|
|
|
.state_mut()
|
|
|
|
.ecs_mut()
|
|
|
|
.insert(MyEntity(my_entity));
|
|
|
|
}
|
2019-04-04 14:45:57 +00:00
|
|
|
Self {
|
|
|
|
scene,
|
2019-01-15 15:13:11 +00:00
|
|
|
client,
|
2019-03-02 03:48:30 +00:00
|
|
|
key_state: KeyState::new(),
|
2019-10-15 04:06:14 +00:00
|
|
|
inputs: comp::ControllerInputs::default(),
|
2019-10-16 11:39:41 +00:00
|
|
|
hud,
|
2019-08-14 21:28:37 +00:00
|
|
|
selected_block: Block::new(BlockKind::Normal, Rgb::broadcast(255)),
|
2019-04-04 14:45:57 +00:00
|
|
|
}
|
2019-01-11 23:18:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-12 15:57:19 +00:00
|
|
|
impl SessionState {
|
2019-05-17 09:22:32 +00:00
|
|
|
/// Tick the session (and the client attached to it).
|
2020-03-07 22:14:21 +00:00
|
|
|
fn tick(&mut self, dt: Duration) -> Result<TickAction, Error> {
|
2019-11-29 15:20:35 +00:00
|
|
|
self.inputs.tick(dt);
|
2020-01-10 00:33:38 +00:00
|
|
|
for event in self.client.borrow_mut().tick(
|
|
|
|
self.inputs.clone(),
|
|
|
|
dt,
|
|
|
|
crate::ecs::sys::add_local_systems,
|
|
|
|
)? {
|
2019-03-17 05:26:51 +00:00
|
|
|
match event {
|
2019-10-17 04:09:01 +00:00
|
|
|
Chat {
|
2019-07-17 22:10:42 +00:00
|
|
|
chat_type: _,
|
|
|
|
message: _,
|
|
|
|
} => {
|
|
|
|
self.hud.new_message(event);
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2020-03-08 08:06:22 +00:00
|
|
|
client::Event::Disconnect => return Ok(TickAction::Disconnect),
|
2019-10-17 04:09:01 +00:00
|
|
|
client::Event::DisconnectionNotification(time) => {
|
2019-10-22 03:46:12 +00:00
|
|
|
let message = match time {
|
|
|
|
0 => String::from("Goodbye!"),
|
|
|
|
_ => format!("Connection lost. Kicking in {} seconds", time),
|
|
|
|
};
|
|
|
|
|
2019-10-17 04:09:01 +00:00
|
|
|
self.hud.new_message(Chat {
|
|
|
|
chat_type: ChatType::Meta,
|
2019-10-22 03:46:12 +00:00
|
|
|
message,
|
2019-10-17 04:09:01 +00:00
|
|
|
});
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-03-17 05:26:51 +00:00
|
|
|
}
|
|
|
|
}
|
2019-04-02 01:05:18 +00:00
|
|
|
|
2020-03-07 22:14:21 +00:00
|
|
|
Ok(TickAction::Continue)
|
2019-01-14 15:47:57 +00:00
|
|
|
}
|
|
|
|
|
2019-05-17 09:22:32 +00:00
|
|
|
/// Clean up the session (and the client attached to it) after a tick.
|
2020-02-01 20:39:39 +00:00
|
|
|
pub fn cleanup(&mut self) { self.client.borrow_mut().cleanup(); }
|
2019-01-23 20:01:58 +00:00
|
|
|
|
2019-01-12 15:57:19 +00:00
|
|
|
/// Render the session to the screen.
|
|
|
|
///
|
|
|
|
/// This method should be called once per frame.
|
|
|
|
pub fn render(&mut self, renderer: &mut Renderer) {
|
|
|
|
// Clear the screen
|
2019-07-04 12:02:26 +00:00
|
|
|
renderer.clear();
|
2019-01-12 15:57:19 +00:00
|
|
|
|
|
|
|
// Render the screen using the global renderer
|
2020-02-29 03:59:11 +00:00
|
|
|
{
|
|
|
|
let client = self.client.borrow();
|
|
|
|
self.scene
|
|
|
|
.render(renderer, client.state(), client.entity(), client.get_tick());
|
|
|
|
}
|
2019-02-16 03:01:42 +00:00
|
|
|
// Draw the UI to the screen
|
2019-05-14 06:43:07 +00:00
|
|
|
self.hud.render(renderer, self.scene.globals());
|
2019-01-12 15:57:19 +00:00
|
|
|
|
|
|
|
// Finish the frame
|
|
|
|
renderer.flush();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-11 23:18:34 +00:00
|
|
|
impl PlayState for SessionState {
|
2019-04-27 20:55:30 +00:00
|
|
|
fn play(&mut self, _: Direction, global_state: &mut GlobalState) -> PlayStateResult {
|
2019-05-17 09:22:32 +00:00
|
|
|
// Trap the cursor.
|
2019-01-23 22:21:47 +00:00
|
|
|
global_state.window.grab_cursor(true);
|
2019-01-12 01:14:58 +00:00
|
|
|
|
2019-05-17 09:22:32 +00:00
|
|
|
// Set up an fps clock.
|
2019-07-01 20:42:43 +00:00
|
|
|
let mut clock = Clock::start();
|
2019-05-25 12:23:56 +00:00
|
|
|
self.client.borrow_mut().clear_terrain();
|
2019-01-12 15:57:19 +00:00
|
|
|
|
2019-07-18 22:50:46 +00:00
|
|
|
// Send startup commands to the server
|
|
|
|
if global_state.settings.send_logon_commands {
|
|
|
|
for cmd in &global_state.settings.logon_commands {
|
|
|
|
self.client.borrow_mut().send_chat(cmd.to_string());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-17 23:43:18 +00:00
|
|
|
// Keep a watcher on the language
|
|
|
|
let mut localization_watcher = watch::ReloadIndicator::new();
|
|
|
|
let mut localized_strings = load_watched::<VoxygenLocalization>(
|
|
|
|
&i18n_asset_key(&global_state.settings.language.selected_language),
|
|
|
|
&mut localization_watcher,
|
|
|
|
)
|
|
|
|
.unwrap();
|
|
|
|
|
2019-01-11 23:18:34 +00:00
|
|
|
// Game loop
|
2019-05-24 19:10:18 +00:00
|
|
|
let mut current_client_state = self.client.borrow().get_client_state();
|
2019-12-31 08:10:51 +00:00
|
|
|
while let ClientState::Pending | ClientState::Character = current_client_state {
|
2019-08-24 17:58:28 +00:00
|
|
|
// Compute camera data
|
2020-02-29 03:59:11 +00:00
|
|
|
self.scene
|
|
|
|
.camera_mut()
|
|
|
|
.compute_dependents(&*self.client.borrow().state().terrain());
|
|
|
|
let camera::Dependents {
|
|
|
|
view_mat, cam_pos, ..
|
|
|
|
} = self.scene.camera().dependents();
|
2020-03-10 20:50:04 +00:00
|
|
|
|
|
|
|
// Choose a spot above the player's head for item distance checks
|
|
|
|
let player_pos = match self
|
|
|
|
.client
|
|
|
|
.borrow()
|
|
|
|
.state()
|
|
|
|
.read_storage::<comp::Pos>()
|
|
|
|
.get(self.client.borrow().entity())
|
|
|
|
{
|
|
|
|
Some(pos) => pos.0 + (Vec3::unit_z() * 2.0),
|
|
|
|
_ => cam_pos, // Should never happen, but a safe fallback
|
|
|
|
};
|
|
|
|
|
2019-08-24 17:58:28 +00:00
|
|
|
let cam_dir: Vec3<f32> = Vec3::from(view_mat.inverted() * -Vec4::unit_z());
|
|
|
|
|
2019-09-26 10:43:03 +00:00
|
|
|
// Check to see whether we're aiming at anything
|
|
|
|
let (build_pos, select_pos) = {
|
|
|
|
let client = self.client.borrow();
|
|
|
|
let terrain = client.state().terrain();
|
2020-03-10 20:50:04 +00:00
|
|
|
|
|
|
|
let cam_ray = terrain
|
2019-09-26 10:43:03 +00:00
|
|
|
.ray(cam_pos, cam_pos + cam_dir * 100.0)
|
2019-09-26 13:03:41 +00:00
|
|
|
.until(|block| block.is_tangible())
|
2019-09-26 10:43:03 +00:00
|
|
|
.cast();
|
2020-03-10 20:50:04 +00:00
|
|
|
|
|
|
|
let cam_dist = cam_ray.0;
|
|
|
|
|
|
|
|
if let Ok(Some(_)) = cam_ray.1 {
|
|
|
|
// The ray hit something, is it within pickup range?
|
|
|
|
let select_pos = if player_pos.distance_squared(cam_pos + cam_dir * cam_dist)
|
|
|
|
<= MAX_PICKUP_RANGE_SQR
|
|
|
|
{
|
|
|
|
Some((cam_pos + cam_dir * cam_dist).map(|e| e.floor() as i32))
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
|
2019-09-26 10:43:03 +00:00
|
|
|
(
|
2020-03-10 20:50:04 +00:00
|
|
|
Some((cam_pos + cam_dir * (cam_dist - 0.01)).map(|e| e.floor() as i32)),
|
|
|
|
select_pos,
|
2019-09-26 10:43:03 +00:00
|
|
|
)
|
|
|
|
} else {
|
|
|
|
(None, None)
|
|
|
|
}
|
|
|
|
};
|
2020-03-10 20:50:04 +00:00
|
|
|
|
2020-01-30 02:49:27 +00:00
|
|
|
// Only highlight collectables
|
|
|
|
self.scene.set_select_pos(select_pos.filter(|sp| {
|
|
|
|
self.client
|
|
|
|
.borrow()
|
|
|
|
.state()
|
|
|
|
.terrain()
|
|
|
|
.get(*sp)
|
|
|
|
.map(|b| b.is_collectible())
|
|
|
|
.unwrap_or(false)
|
|
|
|
}));
|
2019-09-26 10:43:03 +00:00
|
|
|
|
2019-05-17 09:22:32 +00:00
|
|
|
// Handle window events.
|
2020-01-02 03:48:11 +00:00
|
|
|
for event in global_state.window.fetch_events(&mut global_state.settings) {
|
2019-05-17 09:22:32 +00:00
|
|
|
// Pass all events to the ui first.
|
2019-04-20 18:08:39 +00:00
|
|
|
if self.hud.handle_event(event.clone(), global_state) {
|
2019-03-22 03:55:42 +00:00
|
|
|
continue;
|
|
|
|
}
|
2019-05-23 15:14:39 +00:00
|
|
|
|
|
|
|
match event {
|
2019-04-17 15:22:26 +00:00
|
|
|
Event::Close => {
|
|
|
|
return PlayStateResult::Shutdown;
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-08-30 22:13:45 +00:00
|
|
|
Event::InputUpdate(GameInput::Primary, state) => {
|
2019-07-03 17:55:56 +00:00
|
|
|
// Check the existence of CanBuild component. If it's here, use LMB to
|
|
|
|
// place blocks, if not, use it to attack
|
2019-07-04 18:14:14 +00:00
|
|
|
let mut client = self.client.borrow_mut();
|
|
|
|
if state
|
|
|
|
&& client
|
2019-07-03 20:28:13 +00:00
|
|
|
.state()
|
|
|
|
.read_storage::<comp::CanBuild>()
|
|
|
|
.get(client.entity())
|
|
|
|
.is_some()
|
2019-07-04 18:14:14 +00:00
|
|
|
{
|
2019-09-26 10:43:03 +00:00
|
|
|
if let Some(build_pos) = build_pos {
|
|
|
|
client.place_block(build_pos, self.selected_block);
|
2019-07-03 17:55:56 +00:00
|
|
|
}
|
2019-07-03 20:28:13 +00:00
|
|
|
} else {
|
2019-11-29 15:20:35 +00:00
|
|
|
self.inputs.primary.set_state(state);
|
2019-07-03 17:55:56 +00:00
|
|
|
}
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-07-04 18:14:14 +00:00
|
|
|
|
2019-08-30 22:13:45 +00:00
|
|
|
Event::InputUpdate(GameInput::Secondary, state) => {
|
2019-11-29 15:20:35 +00:00
|
|
|
self.inputs.secondary.set_state(false); // To be changed later on
|
2019-09-25 21:17:43 +00:00
|
|
|
|
2019-08-24 16:38:59 +00:00
|
|
|
let mut client = self.client.borrow_mut();
|
2019-09-25 21:17:43 +00:00
|
|
|
|
2019-08-24 16:38:59 +00:00
|
|
|
if state
|
|
|
|
&& client
|
2019-07-03 20:28:13 +00:00
|
|
|
.state()
|
|
|
|
.read_storage::<comp::CanBuild>()
|
|
|
|
.get(client.entity())
|
|
|
|
.is_some()
|
2019-08-24 16:38:59 +00:00
|
|
|
{
|
2019-09-26 10:43:03 +00:00
|
|
|
if let Some(select_pos) = select_pos {
|
|
|
|
client.remove_block(select_pos);
|
2019-06-30 20:25:37 +00:00
|
|
|
}
|
2019-09-25 21:17:43 +00:00
|
|
|
} else {
|
2020-02-24 14:35:07 +00:00
|
|
|
self.inputs.secondary.set_state(state);
|
2020-03-15 14:27:06 +00:00
|
|
|
|
2019-09-26 10:43:03 +00:00
|
|
|
if let Some(select_pos) = select_pos {
|
|
|
|
client.collect_block(select_pos);
|
2019-09-25 21:17:43 +00:00
|
|
|
}
|
2019-06-30 20:25:37 +00:00
|
|
|
}
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-06-11 04:08:55 +00:00
|
|
|
Event::InputUpdate(GameInput::Roll, state) => {
|
2019-07-04 19:59:57 +00:00
|
|
|
let client = self.client.borrow();
|
|
|
|
if client
|
|
|
|
.state()
|
|
|
|
.read_storage::<comp::CanBuild>()
|
|
|
|
.get(client.entity())
|
|
|
|
.is_some()
|
|
|
|
{
|
|
|
|
if state {
|
2019-09-26 10:43:03 +00:00
|
|
|
if let Some(block) = select_pos
|
|
|
|
.and_then(|sp| client.state().terrain().get(sp).ok().copied())
|
2019-07-07 04:37:22 +00:00
|
|
|
{
|
2019-09-26 10:43:03 +00:00
|
|
|
self.selected_block = block;
|
2019-07-04 19:59:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2019-11-29 15:20:35 +00:00
|
|
|
self.inputs.roll.set_state(state);
|
2019-07-04 19:59:57 +00:00
|
|
|
}
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-08-27 11:42:17 +00:00
|
|
|
Event::InputUpdate(GameInput::Respawn, state) => {
|
2019-11-29 15:20:35 +00:00
|
|
|
self.inputs.respawn.set_state(state);
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-06-09 14:20:20 +00:00
|
|
|
Event::InputUpdate(GameInput::Jump, state) => {
|
2019-11-29 15:20:35 +00:00
|
|
|
self.inputs.jump.set_state(state);
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-09-09 19:11:40 +00:00
|
|
|
Event::InputUpdate(GameInput::Sit, state) => {
|
2019-11-29 15:20:35 +00:00
|
|
|
self.inputs.sit.set_state(state);
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-05-25 14:39:27 +00:00
|
|
|
Event::InputUpdate(GameInput::MoveForward, state) => self.key_state.up = state,
|
|
|
|
Event::InputUpdate(GameInput::MoveBack, state) => self.key_state.down = state,
|
|
|
|
Event::InputUpdate(GameInput::MoveLeft, state) => self.key_state.left = state,
|
|
|
|
Event::InputUpdate(GameInput::MoveRight, state) => self.key_state.right = state,
|
2019-05-25 21:13:38 +00:00
|
|
|
Event::InputUpdate(GameInput::Glide, state) => {
|
2019-11-29 15:20:35 +00:00
|
|
|
self.inputs.glide.set_state(state);
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-11-29 15:20:35 +00:00
|
|
|
Event::InputUpdate(GameInput::Climb, state) => {
|
|
|
|
self.inputs.climb.set_state(state)
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-09-09 19:11:40 +00:00
|
|
|
Event::InputUpdate(GameInput::ClimbDown, state) => {
|
2019-11-29 15:20:35 +00:00
|
|
|
self.inputs.climb_down.set_state(state)
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-11-29 15:20:35 +00:00
|
|
|
Event::InputUpdate(GameInput::WallLeap, state) => {
|
|
|
|
self.inputs.wall_leap.set_state(state)
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-09-09 19:11:40 +00:00
|
|
|
Event::InputUpdate(GameInput::Mount, true) => {
|
2019-10-15 04:06:14 +00:00
|
|
|
let mut client = self.client.borrow_mut();
|
2019-09-09 19:11:40 +00:00
|
|
|
if client.is_mounted() {
|
2019-10-15 04:06:14 +00:00
|
|
|
client.unmount();
|
2019-09-09 19:11:40 +00:00
|
|
|
} else {
|
|
|
|
let player_pos = client
|
|
|
|
.state()
|
|
|
|
.read_storage::<comp::Pos>()
|
|
|
|
.get(client.entity())
|
|
|
|
.copied();
|
|
|
|
if let Some(player_pos) = player_pos {
|
|
|
|
// Find closest mountable entity
|
|
|
|
let closest_mountable = (
|
|
|
|
&client.state().ecs().entities(),
|
|
|
|
&client.state().ecs().read_storage::<comp::Pos>(),
|
|
|
|
&client.state().ecs().read_storage::<comp::MountState>(),
|
|
|
|
)
|
|
|
|
.join()
|
|
|
|
.filter(|(_, _, ms)| {
|
|
|
|
if let comp::MountState::Unmounted = ms {
|
|
|
|
true
|
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.min_by_key(|(_, pos, _)| {
|
|
|
|
(player_pos.0.distance_squared(pos.0) * 1000.0) as i32
|
|
|
|
})
|
2019-10-15 04:06:14 +00:00
|
|
|
.map(|(uid, _, _)| uid);
|
2019-09-09 19:11:40 +00:00
|
|
|
|
2019-10-15 04:06:14 +00:00
|
|
|
if let Some(mountee_entity) = closest_mountable {
|
|
|
|
client.mount(mountee_entity);
|
2019-09-09 19:11:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-07-29 16:19:08 +00:00
|
|
|
Event::InputUpdate(GameInput::Interact, state) => {
|
|
|
|
let mut client = self.client.borrow_mut();
|
|
|
|
|
|
|
|
let player_pos = client
|
|
|
|
.state()
|
|
|
|
.read_storage::<comp::Pos>()
|
|
|
|
.get(client.entity())
|
|
|
|
.copied();
|
|
|
|
|
|
|
|
if let (Some(player_pos), true) = (player_pos, state) {
|
|
|
|
let entity = (
|
|
|
|
&client.state().ecs().entities(),
|
|
|
|
&client.state().ecs().read_storage::<comp::Pos>(),
|
|
|
|
&client.state().ecs().read_storage::<comp::Item>(),
|
|
|
|
)
|
|
|
|
.join()
|
|
|
|
.filter(|(_, pos, _)| {
|
|
|
|
pos.0.distance_squared(player_pos.0) < 3.0 * 3.0
|
|
|
|
})
|
|
|
|
.min_by_key(|(_, pos, _)| {
|
|
|
|
(pos.0.distance_squared(player_pos.0) * 1000.0) as i32
|
|
|
|
})
|
|
|
|
.map(|(entity, _, _)| entity);
|
|
|
|
|
|
|
|
if let Some(entity) = entity {
|
|
|
|
client.pick_up(entity);
|
|
|
|
}
|
|
|
|
}
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-11-29 15:20:35 +00:00
|
|
|
Event::InputUpdate(GameInput::ToggleWield, state) => {
|
|
|
|
self.inputs.toggle_wield.set_state(state)
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-12-03 06:30:08 +00:00
|
|
|
Event::InputUpdate(GameInput::Charge, state) => {
|
|
|
|
self.inputs.charge.set_state(state);
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2020-03-10 21:00:13 +00:00
|
|
|
Event::AnalogGameInput(input) => match input {
|
|
|
|
AnalogGameInput::MovementX(v) => {
|
|
|
|
self.key_state.analog_matrix.x = v;
|
|
|
|
},
|
|
|
|
AnalogGameInput::MovementY(v) => {
|
|
|
|
self.key_state.analog_matrix.y = v;
|
|
|
|
},
|
|
|
|
other => {
|
|
|
|
self.scene.handle_input_event(Event::AnalogGameInput(other));
|
|
|
|
},
|
|
|
|
},
|
2019-05-25 14:39:27 +00:00
|
|
|
|
2019-01-12 13:56:34 +00:00
|
|
|
// Pass all other events to the scene
|
2019-04-02 01:05:18 +00:00
|
|
|
event => {
|
|
|
|
self.scene.handle_input_event(event);
|
2020-02-01 20:39:39 +00:00
|
|
|
}, // TODO: Do something if the event wasn't handled?
|
2019-05-23 15:14:39 +00:00
|
|
|
}
|
2019-01-11 23:18:34 +00:00
|
|
|
}
|
|
|
|
|
2020-02-01 20:39:39 +00:00
|
|
|
// Calculate the movement input vector of the player from the current key
|
|
|
|
// presses and the camera direction.
|
2019-06-09 14:20:20 +00:00
|
|
|
let ori = self.scene.camera().get_orientation();
|
|
|
|
let unit_vecs = (
|
|
|
|
Vec2::new(ori[0].cos(), -ori[0].sin()),
|
|
|
|
Vec2::new(ori[0].sin(), ori[0].cos()),
|
|
|
|
);
|
|
|
|
let dir_vec = self.key_state.dir_vec();
|
2019-10-15 04:06:14 +00:00
|
|
|
self.inputs.move_dir = unit_vecs.0 * dir_vec[0] + unit_vecs.1 * dir_vec[1];
|
2019-06-09 14:20:20 +00:00
|
|
|
|
2019-10-15 04:06:14 +00:00
|
|
|
self.inputs.look_dir = cam_dir;
|
2019-08-24 17:58:28 +00:00
|
|
|
|
2020-03-03 19:51:15 +00:00
|
|
|
// Runs if either in a multiplayer server or the singleplayer server is unpaused
|
|
|
|
if global_state.singleplayer.is_none()
|
|
|
|
|| !global_state.singleplayer.as_ref().unwrap().is_paused()
|
|
|
|
{
|
2020-03-01 22:18:22 +00:00
|
|
|
// Perform an in-game tick.
|
2020-03-07 22:14:21 +00:00
|
|
|
match self.tick(clock.get_avg_delta()) {
|
|
|
|
Ok(TickAction::Continue) => {}, // Do nothing
|
|
|
|
Ok(TickAction::Disconnect) => return PlayStateResult::Pop, // Go to main menu
|
|
|
|
Err(err) => {
|
|
|
|
global_state.info_message =
|
|
|
|
Some(localized_strings.get("common.connection_lost").to_owned());
|
|
|
|
error!("[session] Failed to tick the scene: {:?}", err);
|
2020-03-01 22:18:22 +00:00
|
|
|
|
2020-03-07 22:14:21 +00:00
|
|
|
return PlayStateResult::Pop;
|
|
|
|
},
|
2020-03-01 22:18:22 +00:00
|
|
|
}
|
2019-05-26 09:21:51 +00:00
|
|
|
}
|
2019-01-11 23:18:34 +00:00
|
|
|
|
2019-06-05 15:57:48 +00:00
|
|
|
// Maintain global state.
|
2019-08-31 08:30:23 +00:00
|
|
|
global_state.maintain(clock.get_last_delta().as_secs_f32());
|
2019-05-18 20:10:02 +00:00
|
|
|
|
2020-02-29 03:59:11 +00:00
|
|
|
// Recompute dependents just in case some input modified the camera
|
|
|
|
self.scene
|
|
|
|
.camera_mut()
|
|
|
|
.compute_dependents(&*self.client.borrow().state().terrain());
|
2019-06-05 15:57:48 +00:00
|
|
|
// Extract HUD events ensuring the client borrow gets dropped.
|
2020-01-17 23:43:18 +00:00
|
|
|
let mut hud_events = self.hud.maintain(
|
2019-05-14 06:43:07 +00:00
|
|
|
&self.client.borrow(),
|
2019-05-23 08:18:25 +00:00
|
|
|
global_state,
|
2019-05-23 09:30:46 +00:00
|
|
|
DebugInfo {
|
|
|
|
tps: clock.get_tps(),
|
|
|
|
ping_ms: self.client.borrow().get_ping_ms(),
|
2019-05-28 18:23:24 +00:00
|
|
|
coordinates: self
|
|
|
|
.client
|
|
|
|
.borrow()
|
|
|
|
.state()
|
|
|
|
.ecs()
|
|
|
|
.read_storage::<Pos>()
|
|
|
|
.get(self.client.borrow().entity())
|
2019-05-28 19:40:50 +00:00
|
|
|
.cloned(),
|
2019-08-06 21:51:13 +00:00
|
|
|
velocity: self
|
|
|
|
.client
|
|
|
|
.borrow()
|
|
|
|
.state()
|
|
|
|
.ecs()
|
|
|
|
.read_storage::<Vel>()
|
|
|
|
.get(self.client.borrow().entity())
|
|
|
|
.cloned(),
|
2019-11-19 15:13:33 +00:00
|
|
|
num_chunks: self.scene.terrain().chunk_count() as u32,
|
|
|
|
num_visible_chunks: self.scene.terrain().visible_chunk_count() as u32,
|
|
|
|
num_figures: self.scene.figure_mgr().figure_count() as u32,
|
|
|
|
num_figures_visible: self.scene.figure_mgr().figure_count_visible() as u32,
|
2019-05-23 09:30:46 +00:00
|
|
|
},
|
2019-05-20 06:09:20 +00:00
|
|
|
&self.scene.camera(),
|
2019-12-30 12:16:35 +00:00
|
|
|
clock.get_last_delta(),
|
2019-05-23 09:30:46 +00:00
|
|
|
);
|
2019-06-05 15:57:48 +00:00
|
|
|
|
2020-01-17 23:43:18 +00:00
|
|
|
// Look for changes in the localization files
|
|
|
|
if localization_watcher.reloaded() {
|
|
|
|
hud_events.push(HudEvent::ChangeLanguage(localized_strings.metadata.clone()));
|
|
|
|
}
|
|
|
|
|
2019-05-23 09:30:46 +00:00
|
|
|
// Maintain the UI.
|
|
|
|
for event in hud_events {
|
2019-03-16 02:03:21 +00:00
|
|
|
match event {
|
2019-03-17 05:26:51 +00:00
|
|
|
HudEvent::SendMessage(msg) => {
|
|
|
|
// TODO: Handle result
|
2019-04-04 14:45:57 +00:00
|
|
|
self.client.borrow_mut().send_chat(msg);
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-06-02 02:17:36 +00:00
|
|
|
HudEvent::CharacterSelection => {
|
|
|
|
self.client.borrow_mut().request_remove_character()
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-06-02 02:17:36 +00:00
|
|
|
HudEvent::Logout => self.client.borrow_mut().request_logout(),
|
2019-04-17 15:22:26 +00:00
|
|
|
HudEvent::Quit => {
|
|
|
|
return PlayStateResult::Shutdown;
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-06-05 15:57:48 +00:00
|
|
|
HudEvent::AdjustMousePan(sensitivity) => {
|
2019-06-06 17:42:13 +00:00
|
|
|
global_state.window.pan_sensitivity = sensitivity;
|
|
|
|
global_state.settings.gameplay.pan_sensitivity = sensitivity;
|
2019-07-26 02:28:53 +00:00
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-06-05 15:57:48 +00:00
|
|
|
HudEvent::AdjustMouseZoom(sensitivity) => {
|
2019-06-06 17:42:13 +00:00
|
|
|
global_state.window.zoom_sensitivity = sensitivity;
|
|
|
|
global_state.settings.gameplay.zoom_sensitivity = sensitivity;
|
2019-07-26 02:28:53 +00:00
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-10-02 13:09:05 +00:00
|
|
|
HudEvent::ToggleZoomInvert(zoom_inverted) => {
|
|
|
|
global_state.window.zoom_inversion = zoom_inverted;
|
|
|
|
global_state.settings.gameplay.zoom_inversion = zoom_inverted;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2020-01-10 00:33:38 +00:00
|
|
|
HudEvent::Sct(sct) => {
|
|
|
|
global_state.settings.gameplay.sct = sct;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2020-01-10 00:33:38 +00:00
|
|
|
HudEvent::SctPlayerBatch(sct_player_batch) => {
|
|
|
|
global_state.settings.gameplay.sct_player_batch = sct_player_batch;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2020-01-10 00:33:38 +00:00
|
|
|
HudEvent::SctDamageBatch(sct_damage_batch) => {
|
|
|
|
global_state.settings.gameplay.sct_damage_batch = sct_damage_batch;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2020-01-10 00:33:38 +00:00
|
|
|
HudEvent::ToggleDebug(toggle_debug) => {
|
|
|
|
global_state.settings.gameplay.toggle_debug = toggle_debug;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-12-06 22:49:17 +00:00
|
|
|
HudEvent::ToggleMouseYInvert(mouse_y_inverted) => {
|
|
|
|
global_state.window.mouse_y_inversion = mouse_y_inverted;
|
|
|
|
global_state.settings.gameplay.mouse_y_inversion = mouse_y_inverted;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-05-19 00:45:02 +00:00
|
|
|
HudEvent::AdjustViewDistance(view_distance) => {
|
2019-05-20 20:18:01 +00:00
|
|
|
self.client.borrow_mut().set_view_distance(view_distance);
|
|
|
|
|
|
|
|
global_state.settings.graphics.view_distance = view_distance;
|
2019-07-26 02:28:53 +00:00
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-07-07 00:15:22 +00:00
|
|
|
HudEvent::CrosshairTransp(crosshair_transp) => {
|
|
|
|
global_state.settings.gameplay.crosshair_transp = crosshair_transp;
|
2019-07-26 02:28:53 +00:00
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-10-23 19:40:45 +00:00
|
|
|
HudEvent::ChatTransp(chat_transp) => {
|
|
|
|
global_state.settings.gameplay.chat_transp = chat_transp;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-07-23 01:02:57 +00:00
|
|
|
HudEvent::CrosshairType(crosshair_type) => {
|
|
|
|
global_state.settings.gameplay.crosshair_type = crosshair_type;
|
2019-07-26 02:28:53 +00:00
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-10-23 19:40:45 +00:00
|
|
|
HudEvent::Intro(intro_show) => {
|
|
|
|
global_state.settings.gameplay.intro_show = intro_show;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-08-18 18:07:21 +00:00
|
|
|
HudEvent::ToggleXpBar(xp_bar) => {
|
|
|
|
global_state.settings.gameplay.xp_bar = xp_bar;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-08-18 18:07:21 +00:00
|
|
|
HudEvent::ToggleBarNumbers(bar_numbers) => {
|
|
|
|
global_state.settings.gameplay.bar_numbers = bar_numbers;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-08-18 18:07:21 +00:00
|
|
|
HudEvent::ToggleShortcutNumbers(shortcut_numbers) => {
|
|
|
|
global_state.settings.gameplay.shortcut_numbers = shortcut_numbers;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-07-26 02:28:53 +00:00
|
|
|
HudEvent::UiScale(scale_change) => {
|
|
|
|
global_state.settings.gameplay.ui_scale =
|
|
|
|
self.hud.scale_change(scale_change);
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-09-24 16:18:09 +00:00
|
|
|
HudEvent::AdjustMusicVolume(music_volume) => {
|
|
|
|
global_state.audio.set_music_volume(music_volume);
|
2019-07-23 01:02:57 +00:00
|
|
|
|
2019-09-24 16:18:09 +00:00
|
|
|
global_state.settings.audio.music_volume = music_volume;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-09-24 16:18:09 +00:00
|
|
|
HudEvent::AdjustSfxVolume(sfx_volume) => {
|
|
|
|
global_state.audio.set_sfx_volume(sfx_volume);
|
2019-05-20 20:18:01 +00:00
|
|
|
|
2019-09-24 16:18:09 +00:00
|
|
|
global_state.settings.audio.sfx_volume = sfx_volume;
|
2019-07-26 02:28:53 +00:00
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-05-20 17:40:35 +00:00
|
|
|
HudEvent::ChangeAudioDevice(name) => {
|
2019-08-31 06:37:09 +00:00
|
|
|
global_state.audio.set_device(name.clone());
|
2019-05-20 20:18:01 +00:00
|
|
|
|
2019-05-22 11:29:38 +00:00
|
|
|
global_state.settings.audio.audio_device = Some(name);
|
2019-07-26 02:28:53 +00:00
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-06-06 19:11:39 +00:00
|
|
|
HudEvent::ChangeMaxFPS(fps) => {
|
|
|
|
global_state.settings.graphics.max_fps = fps;
|
2019-07-26 02:28:53 +00:00
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-08-30 20:46:45 +00:00
|
|
|
HudEvent::UseInventorySlot(x) => self.client.borrow_mut().use_inventory_slot(x),
|
2019-07-25 22:52:28 +00:00
|
|
|
HudEvent::SwapInventorySlots(a, b) => {
|
|
|
|
self.client.borrow_mut().swap_inventory_slots(a, b)
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-07-26 17:08:40 +00:00
|
|
|
HudEvent::DropInventorySlot(x) => {
|
|
|
|
self.client.borrow_mut().drop_inventory_slot(x)
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-08-05 16:37:52 +00:00
|
|
|
HudEvent::ChangeFOV(new_fov) => {
|
|
|
|
global_state.settings.graphics.fov = new_fov;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2019-09-26 07:28:40 +00:00
|
|
|
self.scene.camera_mut().set_fov_deg(new_fov);
|
2020-02-29 03:59:11 +00:00
|
|
|
self.scene
|
|
|
|
.camera_mut()
|
|
|
|
.compute_dependents(&*self.client.borrow().state().terrain());
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2020-02-12 13:55:26 +00:00
|
|
|
HudEvent::ChangeGamma(new_gamma) => {
|
|
|
|
global_state.settings.graphics.gamma = new_gamma;
|
|
|
|
global_state.settings.save_to_file_warn();
|
|
|
|
},
|
2019-09-26 07:28:40 +00:00
|
|
|
HudEvent::ChangeAaMode(new_aa_mode) => {
|
|
|
|
// Do this first so if it crashes the setting isn't saved :)
|
|
|
|
global_state
|
|
|
|
.window
|
|
|
|
.renderer_mut()
|
|
|
|
.set_aa_mode(new_aa_mode)
|
|
|
|
.unwrap();
|
|
|
|
global_state.settings.graphics.aa_mode = new_aa_mode;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2020-01-19 03:58:25 +00:00
|
|
|
HudEvent::ChangeCloudMode(new_cloud_mode) => {
|
|
|
|
// Do this first so if it crashes the setting isn't saved :)
|
|
|
|
global_state
|
|
|
|
.window
|
|
|
|
.renderer_mut()
|
|
|
|
.set_cloud_mode(new_cloud_mode)
|
|
|
|
.unwrap();
|
|
|
|
global_state.settings.graphics.cloud_mode = new_cloud_mode;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2020-01-19 03:58:25 +00:00
|
|
|
HudEvent::ChangeFluidMode(new_fluid_mode) => {
|
|
|
|
// Do this first so if it crashes the setting isn't saved :)
|
|
|
|
global_state
|
|
|
|
.window
|
|
|
|
.renderer_mut()
|
|
|
|
.set_fluid_mode(new_fluid_mode)
|
|
|
|
.unwrap();
|
|
|
|
global_state.settings.graphics.fluid_mode = new_fluid_mode;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2020-01-17 23:43:18 +00:00
|
|
|
HudEvent::ChangeLanguage(new_language) => {
|
|
|
|
global_state.settings.language.selected_language =
|
|
|
|
new_language.language_identifier;
|
|
|
|
localized_strings = load_watched::<VoxygenLocalization>(
|
|
|
|
&i18n_asset_key(&global_state.settings.language.selected_language),
|
|
|
|
&mut localization_watcher,
|
|
|
|
)
|
|
|
|
.unwrap();
|
|
|
|
localized_strings.log_missing_entries();
|
2020-01-26 19:29:46 +00:00
|
|
|
self.hud.update_language(localized_strings.clone());
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2020-01-02 03:48:11 +00:00
|
|
|
HudEvent::ToggleFullscreen => {
|
|
|
|
global_state
|
|
|
|
.window
|
|
|
|
.toggle_fullscreen(&mut global_state.settings);
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2020-01-02 03:48:11 +00:00
|
|
|
HudEvent::AdjustWindowSize(new_size) => {
|
|
|
|
global_state.window.set_size(new_size.into());
|
|
|
|
global_state.settings.graphics.window_size = new_size;
|
|
|
|
global_state.settings.save_to_file_warn();
|
2020-02-01 20:39:39 +00:00
|
|
|
},
|
2019-03-16 02:03:21 +00:00
|
|
|
}
|
|
|
|
}
|
2019-05-26 14:04:44 +00:00
|
|
|
|
2020-03-03 19:51:15 +00:00
|
|
|
// Runs if either in a multiplayer server or the singleplayer server is unpaused
|
|
|
|
if global_state.singleplayer.is_none()
|
|
|
|
|| !global_state.singleplayer.as_ref().unwrap().is_paused()
|
|
|
|
{
|
2020-02-29 03:59:11 +00:00
|
|
|
let client = self.client.borrow();
|
|
|
|
let scene_data = SceneData {
|
|
|
|
state: client.state(),
|
|
|
|
player_entity: client.entity(),
|
|
|
|
loaded_distance: client.loaded_distance(),
|
|
|
|
view_distance: client.view_distance().unwrap_or(1),
|
|
|
|
tick: client.get_tick(),
|
|
|
|
thread_pool: client.thread_pool(),
|
|
|
|
};
|
2020-03-01 22:18:22 +00:00
|
|
|
self.scene.maintain(
|
|
|
|
global_state.window.renderer_mut(),
|
|
|
|
&mut global_state.audio,
|
2020-02-29 03:59:11 +00:00
|
|
|
&scene_data,
|
2020-03-01 22:18:22 +00:00
|
|
|
global_state.settings.graphics.gamma,
|
|
|
|
);
|
|
|
|
}
|
2019-01-23 20:01:58 +00:00
|
|
|
|
2019-05-17 09:22:32 +00:00
|
|
|
// Render the session.
|
2019-01-12 15:57:19 +00:00
|
|
|
self.render(global_state.window.renderer_mut());
|
2019-01-11 23:18:34 +00:00
|
|
|
|
2019-05-17 09:22:32 +00:00
|
|
|
// Display the frame on the window.
|
2019-04-02 01:05:18 +00:00
|
|
|
global_state
|
|
|
|
.window
|
2019-01-12 01:14:58 +00:00
|
|
|
.swap_buffers()
|
2019-05-17 09:22:32 +00:00
|
|
|
.expect("Failed to swap window buffers!");
|
2019-01-12 15:57:19 +00:00
|
|
|
|
2019-05-17 09:22:32 +00:00
|
|
|
// Wait for the next tick.
|
2019-06-06 19:11:39 +00:00
|
|
|
clock.tick(Duration::from_millis(
|
|
|
|
1000 / global_state.settings.graphics.max_fps as u64,
|
|
|
|
));
|
2019-01-23 20:01:58 +00:00
|
|
|
|
2019-05-17 09:22:32 +00:00
|
|
|
// Clean things up after the tick.
|
2019-01-23 20:01:58 +00:00
|
|
|
self.cleanup();
|
2019-05-24 19:10:18 +00:00
|
|
|
|
|
|
|
current_client_state = self.client.borrow().get_client_state();
|
2019-01-11 23:18:34 +00:00
|
|
|
}
|
2019-05-19 17:22:35 +00:00
|
|
|
|
2020-03-08 20:31:27 +00:00
|
|
|
if let ClientState::Registered = current_client_state {
|
|
|
|
return PlayStateResult::Switch(Box::new(CharSelectionState::new(
|
|
|
|
global_state,
|
|
|
|
self.client.clone(),
|
|
|
|
)));
|
|
|
|
}
|
|
|
|
|
2019-05-19 17:22:35 +00:00
|
|
|
PlayStateResult::Pop
|
2019-01-11 23:18:34 +00:00
|
|
|
}
|
|
|
|
|
2020-02-01 20:39:39 +00:00
|
|
|
fn name(&self) -> &'static str { "Session" }
|
2019-01-11 23:18:34 +00:00
|
|
|
}
|