jrd/vrtue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no all caps for enum variants

Browse Source
This commit is contained in:
Jared Roberts
2016-10-10 19:08:21 -07:00
parent f795c73ed8
commit 381157c8e2
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/scenes/world.rs
View File

@@ -112,8 +112,8 @@ fn get_model(world: &model::World) -> (Vec<Vertex>, Vec<u32>) {
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
enum TrackMode {
TOUCH,
PRESS
Touch,
Press
}
pub struct WorldScene<D: gfx::Device,
@@ -185,13 +185,13 @@ impl<D: gfx::Device,
use vr::Event::*;
match event {
Vr(Touch { dev_idx, .. }) => {
self.pads.insert(dev_idx, (TrackMode::TOUCH, None));
self.pads.insert(dev_idx, (TrackMode::Touch, None));
},
Vr(Press { dev_idx, .. }) => {
self.pads.insert(dev_idx, (TrackMode::PRESS, None));
self.pads.insert(dev_idx, (TrackMode::Press, None));
},
Vr(Unpress { dev_idx, .. }) => {
self.pads.insert(dev_idx, (TrackMode::TOUCH, None));
self.pads.insert(dev_idx, (TrackMode::Touch, None));
},
Vr(Untouch { dev_idx, .. }) => {
self.pads.remove(&dev_idx);
@@ -213,7 +213,7 @@ impl<D: gfx::Device,
if let Some(state) = vr.get_controller_state(*pad) {
if let Some(old_state) = track.1 {
match mode {
TrackMode::TOUCH => {
TrackMode::Touch => {
const THRESHOLD: f32 = 0.005;
const SCALE: f32 = 32.0;
let xdiff = state.rAxis[0].x - old_state.rAxis[0].x;
@@ -221,7 +221,7 @@ impl<D: gfx::Device,
if xdiff.abs() > THRESHOLD { self.treadmills.0 += SCALE * xdiff; }
if ydiff.abs() > THRESHOLD { self.treadmills.1 += SCALE * ydiff; }
},
TrackMode::PRESS => {
TrackMode::Press => {
let rot = na::Vector3::new(0.0, 0.0, 0.0);
let speed = R2 * 0.01;
if state.rAxis[0].x > 0.5 {