Remove time crate in favor of std::time, removing last usage in main

Combined with these changes, which also convert to std::time:
47aeb83da2 logo text
2f861f815a light updates
9677f8ae9c server ping
This commit is contained in:
ice_iix 2018-09-29 23:11:47 -07:00
parent 9677f8ae9c
commit 6eaf1688f4
3 changed files with 9 additions and 11 deletions

1
Cargo.lock generated
View File

@ -21,7 +21,6 @@ dependencies = [
"steven_gl 0.0.1",
"steven_resources 0.1.0",
"steven_shared 0.0.1",
"time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
"zip 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)",
]

View File

@ -19,7 +19,6 @@ serde_json = "0.7.0"
flate2 = "0.2.13"
zip = "0.1.16"
image = "0.7.0"
time = "0.1.34"
rand = "0.3.14"
rustc-serialize = "0.3.18"
log = "0.3.5"

View File

@ -18,7 +18,7 @@
extern crate sdl2;
extern crate zip;
extern crate image;
extern crate time;
use std::time::{Instant, Duration};
extern crate byteorder;
extern crate serde_json;
extern crate openssl;
@ -213,8 +213,8 @@ fn main() {
let renderer = render::Renderer::new(resource_manager.clone());
let mut ui_container = ui::Container::new();
let mut last_frame = time::now();
let frame_time = (time::Duration::seconds(1).num_nanoseconds().unwrap() as f64) / 60.0;
let mut last_frame = Instant::now();
let frame_time = 1e9f64 / 60.0;
let mut screen_sys = screen::ScreenSystem::new();
screen_sys.add_screen(Box::new(screen::Login::new(vars.clone())));
@ -238,10 +238,10 @@ fn main() {
let mut events = game.sdl.event_pump().unwrap();
while !game.should_close {
let now = time::now();
let diff = now - last_frame;
let now = Instant::now();
let diff = now.duration_since(last_frame);
last_frame = now;
let delta = (diff.num_nanoseconds().unwrap() as f64) / frame_time;
let delta = (diff.subsec_nanos() as f64) / frame_time;
let (width, height) = window.drawable_size();
let version = {
@ -274,10 +274,10 @@ fn main() {
if fps_cap > 0 && !vsync {
let frame_time = time::now() - now;
let sleep_interval = time::Duration::milliseconds(1000 / fps_cap);
let frame_time = now.elapsed();
let sleep_interval = Duration::from_millis(1000 / fps_cap as u64);
if frame_time < sleep_interval {
thread::sleep((sleep_interval - frame_time).to_std().unwrap());
thread::sleep(sleep_interval - frame_time);
}
}
window.gl_swap_window();