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

2
src/bin/tileview.rs
View File

@@ -22,7 +22,7 @@ fn main() {
let mut ega_vec = Vec::<u8>::new(); let mut ega_vec = Vec::<u8>::new();
file.read_to_end(&mut ega_vec).expect("Read EGA file"); file.read_to_end(&mut ega_vec).expect("Read EGA file");
let ega_page = ega::decode(&ega_vec, Compression::UNCOMPRESSED, Tiling::TILED(16)); let ega_page = ega::decode(&ega_vec, Compression::Uncompressed, Tiling::Tiled(16));
for (i, tilepixels) in ega_page.iter().enumerate() { for (i, tilepixels) in ega_page.iter().enumerate() {
let out_name = format!("out/{}.png", i); let out_name = format!("out/{}.png", i);
let out_file = std::fs::File::create(Path::new(&out_name)).expect("open out file"); let out_file = std::fs::File::create(Path::new(&out_name)).expect("open out file");

16
src/ega.rs
View File

@@ -16,14 +16,14 @@ static EGA_PALETTE: [[u8; 4]; 16] = [[0x00, 0x00, 0x00, 0x00],
[0xFF, 0xFF, 0xFF, 0x00]]; [0xFF, 0xFF, 0xFF, 0x00]];
pub enum Compression { pub enum Compression {
UNCOMPRESSED, Uncompressed,
RLE, Rle,
LZW Lzw
} }
pub enum Tiling { pub enum Tiling {
UNTILED, Untiled,
TILED(u16) Tiled(u16)
} }
pub struct EgaPage { pub struct EgaPage {
@@ -98,7 +98,7 @@ pub fn decode<'a>(buf: &[u8], compression: Compression, tiling: Tiling)
let out: Vec<u8>; let out: Vec<u8>;
out = match compression { out = match compression {
Compression::UNCOMPRESSED => buf.iter() Compression::Uncompressed => buf.iter()
.flat_map(|tile_byte| { .flat_map(|tile_byte| {
EGA_PALETTE[(tile_byte >> 4u8 & 0xF) as usize] EGA_PALETTE[(tile_byte >> 4u8 & 0xF) as usize]
.into_iter() .into_iter()
@@ -110,8 +110,8 @@ pub fn decode<'a>(buf: &[u8], compression: Compression, tiling: Tiling)
_ => unimplemented!() _ => unimplemented!()
}; };
let dim = match tiling { let dim = match tiling {
Tiling::TILED(tiledim) => tiledim as usize, Tiling::Tiled(tiledim) => tiledim as usize,
Tiling::UNTILED => out.len() Tiling::Untiled => out.len()
}; };
EgaPage { data: out, dim: dim} EgaPage { data: out, dim: dim}
} }

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

2
src/tile.rs
View File

@@ -29,7 +29,7 @@ pub fn get_tiles<D, F, T>(device: &mut D,
.expect(&format!("failed opening tiles file: {}", filename)); .expect(&format!("failed opening tiles file: {}", filename));
let mut ega_bytes = Vec::new(); let mut ega_bytes = Vec::new();
file.read_to_end(&mut ega_bytes).expect("Read tiles file"); file.read_to_end(&mut ega_bytes).expect("Read tiles file");
let ega_page = ega::decode(&ega_bytes, ega::Compression::UNCOMPRESSED, ega::Tiling::TILED(TILEDIM)); let ega_page = ega::decode(&ega_bytes, ega::Compression::Uncompressed, ega::Tiling::Tiled(TILEDIM));
let mipmap = ega_page.mipmap(2); let mipmap = ega_page.mipmap(2);
let tex = factory.create_texture_const_u8::<T>(tex::Kind::D2Array(mipmap.dim as u16, let tex = factory.create_texture_const_u8::<T>(tex::Kind::D2Array(mipmap.dim as u16,

8
src/town.rs
View File

@@ -6,10 +6,10 @@ use tile::Tile;
#[allow(dead_code)] #[allow(dead_code)]
#[derive(Clone, Copy, Debug)] #[derive(Clone, Copy, Debug)]
enum Behavior { enum Behavior {
FIXED = 0x00, Fixed = 0x00,
WANDER = 0x01, Wander = 0x01,
FOLLOW = 0x80, Follow = 0x80,
ATTACK = 0xFF, Attack = 0xFF,
} }
#[derive(Clone, Copy)] #[derive(Clone, Copy)]