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

cleanup warnings/weird code

Browse Source
This commit is contained in:
Jared Burce
2021-02-04 07:33:23 -08:00
parent ede85ecb5d
commit a91ee62190
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ega.rs
View File

@@ -221,11 +221,11 @@ impl U4Lzw {
} }
fn hash_primary(root: u8, code: u16) -> usize { fn hash_primary(root: u8, code: u16) -> usize {
((root as (u16) << 4) ^ code) as usize (((root as u16) << 4) ^ code) as usize
} }
fn hash_secondary(root: u8, code: u16) -> usize { fn hash_secondary(root: u8, code: u16) -> usize {
let base = (((root as (u16) << 1) + code) | 0x800) as u32; let base = ((((root as u16) << 1) + code) | 0x800) as u32;
let squared = base * base; let squared = base * base;
((squared & 0x0003ffc0) >> 6) as usize ((squared & 0x0003ffc0) >> 6) as usize
} }

2
src/view.rs
View File

@@ -85,7 +85,7 @@ impl ViewRoot<gfx_device_gl::Device, ColorFormat, DepthFormat> {
let depth = &buffers.as_ref().expect("vr depth buffer").depth; let depth = &buffers.as_ref().expect("vr depth buffer").depth;
let proj_mat = vr.projection_matrix(eye, NEAR, FAR); let proj_mat = vr.projection_matrix(eye, NEAR, FAR);
let mut eye_mat = vr.head_to_eye_transform(eye); let eye_mat = vr.head_to_eye_transform(eye);
let scene_mat = scene.origin(); let scene_mat = scene.origin();
let viewmodel_mat = eye_mat * hmd_mat * scene_mat; let viewmodel_mat = eye_mat * hmd_mat * scene_mat;
let trans = Trans { viewmodel: *viewmodel_mat.as_ref(), let trans = Trans { viewmodel: *viewmodel_mat.as_ref(),