mitchellhansen/Trac3r-rust
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed warnings

Browse Source
This commit is contained in:
MitchellHansen
2019-01-24 16:07:24 -08:00
parent 41b3dd4d0f
commit 860ea2deab
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main.rs
View File

@@ -1,4 +1,6 @@
#![allow(dead_code)]
#![allow(unused_variables)]
#![allow(unused_mut)]
extern crate quick_xml; extern crate quick_xml;
extern crate sfml; extern crate sfml;
@@ -9,7 +11,7 @@ use quick_xml::events::Event as xmlEvent;
use quick_xml::Reader; use quick_xml::Reader;
use sfml::graphics::{ use sfml::graphics::{
CircleShape, Color, Drawable, CircleShape, Color, Drawable,
RectangleShape, RenderStates, RenderStates,
RenderTarget, RenderWindow, Shape, RenderTarget, RenderWindow, Shape,
Transformable, Transformable,
}; };
@@ -18,20 +20,15 @@ use std::borrow::Cow;
use std::collections::HashMap; use std::collections::HashMap;
use std::str::FromStr; use std::str::FromStr;
use sfml::graphics::{ Texture, Sprite, IntRect}; use sfml::graphics::{ Texture, Sprite, IntRect};
use cgmath::{InnerSpace, Vector2 }; use cgmath::{Vector2 };
use std::time::SystemTime;
use std::time::UNIX_EPOCH;
use std::time::Instant;
use std::collections::HashSet; use std::collections::HashSet;
fn read_spritesheet(filename: String) -> HashMap<String, HashMap<String, i32>> { fn read_spritesheet(filename: String) -> HashMap<String, HashMap<String, i32>> {
let mut reader = Reader::from_file(filename).unwrap(); let mut reader = Reader::from_file(filename).unwrap();
reader.trim_text(true); reader.trim_text(true);
let mut count = 0;
let mut buf = Vec::new(); let mut buf = Vec::new();
let mut t : HashMap<String, HashMap<String, i32>> = HashMap::new(); let mut t : HashMap<String, HashMap<String, i32>> = HashMap::new();
loop { loop {
@@ -61,14 +58,14 @@ fn read_spritesheet(filename: String) -> HashMap<String, HashMap<String, i32>> {
let value = match attr.value { let value = match attr.value {
Cow::Borrowed(r) => String::from_utf8_lossy(&r), Cow::Borrowed(r) => String::from_utf8_lossy(&r),
Cow::Owned(r) => break Cow::Owned(_) => break
}; };
name = value.to_lowercase() name = value.to_lowercase()
} else { } else {
let value = match attr.value { let value = match attr.value {
Cow::Borrowed(r) => String::from_utf8_lossy(&r), Cow::Borrowed(r) => String::from_utf8_lossy(&r),
Cow::Owned(r) => break Cow::Owned(_) => break
}; };
map_entry.insert(String::from(key), FromStr::from_str(&value[..]).expect("")); map_entry.insert(String::from(key), FromStr::from_str(&value[..]).expect(""));
@@ -107,7 +104,7 @@ impl Timer {
} }
fn elap_time(&mut self) -> f32 { fn elap_time(&mut self) -> f32 {
self.stopwatch.ms() self.stopwatch.ms()/1000.0
} }
fn frame_time(&mut self) -> f32 { fn frame_time(&mut self) -> f32 {
@@ -223,17 +220,18 @@ fn main() {
); );
let mut player = Player::new(); let mut player = Player::new();
let step_size: f32 = 0.005;
let mut frame_time: f32 = 0.0;
let mut elapsed_time: f32 = 0.0;
let mut delta_time: f32 = 0.0;
let mut accumulator_time: f32 = 0.0;
let mut current_time: f32 = 0.0;
let mut timer = Timer::new(); let mut timer = Timer::new();
let mut input = Input::new(); let mut input = Input::new();
let step_size: f32 = 0.005;
let mut elapsed_time: f32;
let mut delta_time: f32;
let mut accumulator_time: f32 = 0.0;
let mut current_time: f32 = timer.elap_time();
while window.is_open() { while window.is_open() {
while let Some(event) = window.poll_event() { while let Some(event) = window.poll_event() {
@@ -262,7 +260,7 @@ fn main() {
player.impulse(&Vector2::new(1.0, 0.0)); player.impulse(&Vector2::new(1.0, 0.0));
} }
elapsed_time = timer.elap_time()/1000.0; elapsed_time = timer.elap_time();
delta_time = elapsed_time - current_time; delta_time = elapsed_time - current_time;
current_time = elapsed_time; current_time = elapsed_time;
if delta_time > 0.02 { if delta_time > 0.02 {