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

remove bitrot, update and set versions of all deps, notably gfx & nalgebra

Browse Source
This commit is contained in:
Jared Burce
2018-08-14 15:25:44 -07:00
parent 493563b7cc
commit 7ac96862eb
9 changed files with 209 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/view.rs
View File

@@ -2,11 +2,12 @@ use vr::{self, AsMatrix4, VR};
extern crate gfx_device_gl;
extern crate piston_window;
extern crate openvr_sys;
use gfx;
use gfx::Device;
use gfx::traits::FactoryExt;
use na::{self, Inverse, ToHomogeneous};
use na;
use self::piston_window::{PistonWindow, Window};
pub type ColorFormat = gfx::format::Srgba8;
@@ -38,12 +39,12 @@ impl ViewRoot<gfx_device_gl::Device, ColorFormat, DepthFormat> {
if let &Some(ref vr) = vr {
let render_size = vr.recommended_render_target_size();
let render_size = vr::Size { width: render_size.width * 100 / 100,
height: render_size.height * 100 / 100 };
let render_size = (render_size.0 * 100 / 100,
render_size.1 * 100 / 100);
let left = vr::create_eyebuffer(&mut window.factory, render_size)
let left = vr::create_eyebuffer(&mut window.factory, render_size.0, render_size.1)
.expect("create left renderbuffer");
let right = vr::create_eyebuffer(&mut window.factory, render_size)
let right = vr::create_eyebuffer(&mut window.factory, render_size.0, render_size.1)
.expect("create right renderbuffer");
let trans = window.factory.create_constant_buffer(1);
@@ -67,13 +68,16 @@ impl ViewRoot<gfx_device_gl::Device, ColorFormat, DepthFormat> {
pub fn draw(&self,
window: &mut PistonWindow,
vr: &mut Option<vr::VR>,
scene: &::scene::Scene<gfx_device_gl::Device, gfx_device_gl::Factory>) {
scene: &::scene::Scene<gfx_device_gl::Device, gfx_device_gl::Factory>)
-> Result<(), vr::Error>
{
if let &mut Some(ref mut vr) = vr {
// Get the current sensor state
let poses = vr.poses();
let poses = vr.poses().expect("vr poses");
let mut hmd_mat = poses.poses[0].to_device.as_matrix4();
hmd_mat.inverse_mut();
let mut hmd_mat = poses[0].device_to_absolute_tracking().as_matrix4();
let inv_worked = hmd_mat.try_inverse_mut();
assert!(inv_worked, "hmd matrix invert");
for &(eye, buffers) in [(vr::Eye::Left, &self.left),
(vr::Eye::Right, &self.right)].into_iter() {
@@ -81,7 +85,7 @@ impl ViewRoot<gfx_device_gl::Device, ColorFormat, DepthFormat> {
let depth = &buffers.as_ref().expect("vr depth buffer").depth;
let proj_mat = vr.projection_matrix(eye, NEAR, FAR);
let eye_mat = vr.head_to_eye_transform(eye);
let mut eye_mat = vr.head_to_eye_transform(eye);
let scene_mat = scene.origin();
let viewmodel_mat = eye_mat * hmd_mat * scene_mat;
let trans = Trans { viewmodel: *viewmodel_mat.as_ref(),
@@ -99,11 +103,11 @@ impl ViewRoot<gfx_device_gl::Device, ColorFormat, DepthFormat> {
let head_mat = na::Similarity3::new(na::Vector3::new(0.0, -1.5, 0.0),
na::Vector3::new(0.0, 0.0, 0.0),
1.0).to_homogeneous();
let proj_mat = na::PerspectiveMatrix3::new(1.0, 90.0, NEAR, FAR).to_matrix();
let proj_mat = na::geometry::Perspective3::new(1.0, 90.0, NEAR, FAR);
let scene_mat = scene.origin();
let viewmodel_mat = head_mat * scene_mat;
let trans = Trans { viewmodel: *viewmodel_mat.as_ref(),
matrix: *(proj_mat * viewmodel_mat).as_ref() };
matrix: *(proj_mat.as_matrix() * viewmodel_mat).as_ref() };
window.encoder.update_constant_buffer(&self.trans, &trans);
}
// draw monitor window
@@ -117,10 +121,11 @@ impl ViewRoot<gfx_device_gl::Device, ColorFormat, DepthFormat> {
if let (&mut Some(ref mut vr),
&Some(ref left),
&Some(ref right)) = (vr, &self.left, &self.right) {
vr.submit(vr::Eye::Left, &left.tex);
vr.submit(vr::Eye::Right, &right.tex);
vr.submit(vr::Eye::Left, &left.tex)?;
vr.submit(vr::Eye::Right, &right.tex)?;
}
window.window.swap_buffers();
window.device.cleanup();
Ok(())
}
}