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/bin/click.rs
View File

@@ -4,7 +4,6 @@ use vrtue::vr;
extern crate env_logger;
extern crate gfx;
#[macro_use] extern crate log;
extern crate openvr_sys;
extern crate piston_window;
use self::piston_window::{PistonWindow, Window, WindowSettings};
@@ -22,9 +21,9 @@ pub fn main() {
.build().expect("Building Window");
let render_size = vr.recommended_render_target_size();
let left: vr::EyeBuffer<ColorFormat, DepthFormat> = vr::create_eyebuffer(&mut window.factory, render_size)
let left: vr::EyeBuffer<ColorFormat, DepthFormat> = vr::create_eyebuffer(&mut window.factory, render_size.0, render_size.1)
.expect("create left renderbuffer");
let right: vr::EyeBuffer<ColorFormat, DepthFormat> = vr::create_eyebuffer(&mut window.factory, render_size)
let right: vr::EyeBuffer<ColorFormat, DepthFormat> = vr::create_eyebuffer(&mut window.factory, render_size.0, render_size.1)
.expect("create right renderbuffer");
window.encoder.clear(&left.target, [1.0, 0.0, 0.0, 1.0]);
window.encoder.clear_depth(&left.depth, 1.0);
@@ -32,31 +31,31 @@ pub fn main() {
window.encoder.clear_depth(&right.depth, 1.0);
window.encoder.flush(&mut window.device);
let mut pads = ::std::collections::BTreeMap::<_, Option<openvr_sys::VRControllerState_t>>::new();
let mut pads = ::std::collections::BTreeMap::<_, Option<vr::ControllerState>>::new();
'main: loop {
let _poses = vr.poses();
vr.submit(vr::Eye::Left, &left.tex);
vr.submit(vr::Eye::Right, &right.tex);
vr.submit(vr::Eye::Left, &left.tex).expect("submit left eye");
vr.submit(vr::Eye::Right, &right.tex).expect("submit right eye");
while let Some(ev) = vr.poll_next_event() {
match ev {
vr::Event::Press { dev_idx, controller } => {
println!("Press event on #{}: {:?}", dev_idx, controller);
vr::Event::Press { dev_idx, button } => {
println!("Press event on #{}: {}", dev_idx, button);
},
vr::Event::Unpress { dev_idx, controller } => {
println!("Unpress event on #{}: {:?}", dev_idx, controller);
vr::Event::Unpress { dev_idx, button } => {
println!("Unpress event on #{}: {}", dev_idx, button);
},
vr::Event::Touch { dev_idx, controller } => {
if controller.button == openvr_sys::EVRButtonId_k_EButton_SteamVR_Touchpad as u32 {
vr::Event::Touch { dev_idx, button } => {
if button == vr::button_id::STEAM_VR_TOUCHPAD as u32 {
pads.insert(dev_idx, None);
}
println!("Touch event on #{}: {:?}", dev_idx, controller);
println!("Touch event on #{}: {}", dev_idx, button);
},
vr::Event::Untouch { dev_idx, controller } => {
if controller.button == openvr_sys::EVRButtonId_k_EButton_SteamVR_Touchpad as u32 {
vr::Event::Untouch { dev_idx, button } => {
if button == vr::button_id::STEAM_VR_TOUCHPAD as u32 {
pads.remove(&dev_idx);
}
println!("Untouch event on #{}: {:?}", dev_idx, controller);
println!("Untouch event on #{}: {}", dev_idx, button);
},
/*
t if t == openvr_sys::EVREventType::EVREventType_VREvent_TouchPadMove as u32 => {
@@ -74,7 +73,7 @@ pub fn main() {
for (pad, old) in pads.iter_mut() {
if let Some(state) = vr.get_controller_state(*pad) {
if let Some(old_state) = *old {
if state.unPacketNum == old_state.unPacketNum {
if state.packet_num == old_state.packet_num {
continue;
}
}

8
src/bin/vrtue.rs
View File

@@ -8,7 +8,7 @@ extern crate gfx_device_gl;
extern crate piston;
extern crate piston_window;
use self::piston::input::{Button, Input, Key};
use self::piston::input::{Button, ButtonArgs, Input, Key};
use self::piston_window::{PistonWindow, Window, WindowSettings};
use std::env;
@@ -37,13 +37,13 @@ pub fn main() {
//while let Some(_) = window.next() {
loop {
scene.update(&mut vr, &mut window.encoder);
view.draw(&mut window, &mut vr, &scene);
view.draw(&mut window, &mut vr, &scene).expect("main draw");
// handle window events
while let Some(ev) = window.poll_event() {
match ev {
Input::Press(Button::Keyboard(Key::Space)) |
Input::Press(Button::Keyboard(Key::Escape)) => break 'main,
Input::Button(ButtonArgs { button: Button::Keyboard(Key::Space), .. }) |
Input::Button(ButtonArgs { button: Button::Keyboard(Key::Escape), .. }) => break 'main,
_ => debug!("\t{:?}", ev)
}