consolidate imports

This commit is contained in:
2016-10-26 22:52:42 -07:00
parent f6b0068ec2
commit 9db44c212c
7 changed files with 22 additions and 34 deletions

View File

@@ -5,22 +5,17 @@ use vr;
use world as model;
use world::HasMap;
extern crate gfx;
extern crate memmap;
extern crate nalgebra as na;
extern crate num_traits;
extern crate openvr_sys;
extern crate piston;
use std::collections::BTreeMap;
use std::marker::PhantomData;
use std::time::SystemTime;
use gfx::tex;
use gfx::{self, tex};
use gfx::traits::FactoryExt;
use self::na::ToHomogeneous;
use self::num_traits::identities::One;
use self::piston::input::{Button, Input, Key};
use na::{self, ToHomogeneous};
use num_traits::identities::One;
use piston::input::{Button, Input, Key};
const PI: f32 = ::std::f32::consts::PI;
const TWO_PI_CIRC: f32 = 2.0 * PI / 256.0;
@@ -140,7 +135,7 @@ pub struct WorldScene<D: gfx::Device,
start_time: SystemTime,
treadmills: (f32, f32),
pads: BTreeMap<u32, (TrackMode, Option<openvr_sys::VRControllerState_t>)>,
pads: BTreeMap<u32, (TrackMode, Option<vr::VRControllerState_t>)>,
_worldmap: model::World,
lat: u8,