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

Merge branch 'songtronix/clean-voxygen-rs-files' into 'master'

Browse Source 
clean voxygen rs files

See merge request veloren/veloren!292
This commit is contained in:
Joshua Barretto
2019-07-02 21:29:38 +00:00
parent 2ab7c7767f 0c0e93a61f
commit aeed04fe41
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
voxygen/src/error.rs
View File

@ -8,7 +8,7 @@ pub enum Error {
/// An error relating to the internal client. /// An error relating to the internal client.
ClientError(client::Error), ClientError(client::Error),
/// A miscellaneous error relating to a backend dependency. /// A miscellaneous error relating to a backend dependency.
BackendError(Box<any::Any>), BackendError(Box<dyn any::Any>),
/// An error relating the rendering subsystem. /// An error relating the rendering subsystem.
RenderError(RenderError), RenderError(RenderError),
/// A miscellaneous error with an unknown or unspecified source. /// A miscellaneous error with an unknown or unspecified source.

2
voxygen/src/session.rs
View File

@ -24,7 +24,7 @@ pub struct SessionState {
/// Represents an active game session (i.e., the one being played). /// Represents an active game session (i.e., the one being played).
impl SessionState { impl SessionState {
/// Create a new `SessionState`. /// Create a new `SessionState`.
pub fn new(window: &mut Window, client: Rc<RefCell<Client>>, settings: Settings) -> Self { pub fn new(window: &mut Window, client: Rc<RefCell<Client>>, _settings: Settings) -> Self {
// Create a scene for this session. The scene handles visible elements of the game world. // Create a scene for this session. The scene handles visible elements of the game world.
let scene = Scene::new(window.renderer_mut(), &client.borrow()); let scene = Scene::new(window.renderer_mut(), &client.borrow());
Self { Self {

10
voxygen/src/singleplayer.rs
View File

@ -19,7 +19,7 @@ enum Msg {
/// Used to start and stop the background thread running the server /// Used to start and stop the background thread running the server
/// when in singleplayer mode. /// when in singleplayer mode.
pub struct Singleplayer { pub struct Singleplayer {
server_thread: JoinHandle<()>, _server_thread: JoinHandle<()>,
sender: Sender<Msg>, sender: Sender<Msg>,
} }
@ -46,7 +46,7 @@ impl Singleplayer {
( (
Singleplayer { Singleplayer {
server_thread: thread, _server_thread: thread,
sender, sender,
}, },
sock, sock,
@ -74,9 +74,9 @@ fn run_server(mut server: Server, rec: Receiver<Msg>) {
for event in events { for event in events {
match event { match event {
Event::ClientConnected { entity } => info!("Client connected!"), Event::ClientConnected { .. } => info!("Client connected!"),
Event::ClientDisconnected { entity } => info!("Client disconnected!"), Event::ClientDisconnected { .. } => info!("Client disconnected!"),
Event::Chat { entity, msg } => info!("[Client] {}", msg), Event::Chat { entity: _, msg } => info!("[Client] {}", msg),
} }
} }

2
voxygen/src/window.rs
View File

@ -181,7 +181,7 @@ impl Window {
let window = &mut self.window; let window = &mut self.window;
let focused = &mut self.focused; let focused = &mut self.focused;
let key_map = &self.key_map; let key_map = &self.key_map;
let mut keypress_map = &mut self.keypress_map; let keypress_map = &mut self.keypress_map;
let pan_sensitivity = self.pan_sensitivity; let pan_sensitivity = self.pan_sensitivity;
let zoom_sensitivity = self.zoom_sensitivity; let zoom_sensitivity = self.zoom_sensitivity;
let mut toggle_fullscreen = false; let mut toggle_fullscreen = false;