refactor view/scene to separate modules
This commit is contained in:
218
src/bin/gl.rs
218
src/bin/gl.rs
@@ -1,218 +0,0 @@
|
||||
extern crate vrtue;
|
||||
use vrtue::{tile, vr};
|
||||
use vrtue::vr::AsMatrix4;
|
||||
|
||||
extern crate env_logger;
|
||||
#[macro_use] extern crate gfx;
|
||||
extern crate gl;
|
||||
#[macro_use] extern crate log;
|
||||
extern crate nalgebra as na;
|
||||
extern crate num_traits;
|
||||
extern crate piston_window;
|
||||
|
||||
use gfx::{tex, Device, Factory};
|
||||
use gfx::traits::FactoryExt;
|
||||
use na::Inverse;
|
||||
use num_traits::identities::One;
|
||||
use piston_window::{PistonWindow, Window, WindowSettings};
|
||||
|
||||
pub type ColorFormat = gfx::format::Srgba8;
|
||||
pub type DepthFormat = gfx::format::DepthStencil;
|
||||
|
||||
const NEAR: f32 = 0.01;
|
||||
const FAR: f32 = 1000.0;
|
||||
|
||||
gfx_defines!{
|
||||
vertex Vertex {
|
||||
pos: [f32; 3] = "a_pos",
|
||||
uv: [f32; 2] = "a_uv",
|
||||
}
|
||||
|
||||
constant Trans {
|
||||
matrix: [[f32; 4]; 4] = "u_matrix",
|
||||
}
|
||||
|
||||
pipeline pipe {
|
||||
vbuf: gfx::VertexBuffer<Vertex> = (),
|
||||
trans: gfx::ConstantBuffer<Trans> = "b_trans",
|
||||
tiles: gfx::TextureSampler<[f32; 4]> = "t_tiles",
|
||||
pixcolor: gfx::RenderTarget<ColorFormat> = "pixcolor",
|
||||
depth: gfx::DepthTarget<DepthFormat> = gfx::preset::depth::LESS_EQUAL_WRITE,
|
||||
}
|
||||
}
|
||||
|
||||
const POLYGON: [Vertex; 4] = [
|
||||
Vertex { pos: [ -0.25, -0.25, 0. ], uv: [0., 0.] },
|
||||
Vertex { pos: [ 0.25, -0.25, 0. ], uv: [1., 0.] },
|
||||
Vertex { pos: [ 0.25, 0.25, 0. ], uv: [1., 1.] },
|
||||
Vertex { pos: [ -0.25, 0.25, 0. ], uv: [0., 1.] }
|
||||
];
|
||||
const POLYGON_IDX: &'static [u16] = &[ 0, 1, 2,
|
||||
2, 3, 0 ];
|
||||
|
||||
fn main() {
|
||||
env_logger::init().expect("env logger");
|
||||
let mut vr = vr::VR::new().expect("VR init");
|
||||
let render_size = vr.recommended_render_target_size();
|
||||
|
||||
let mut window: PistonWindow =
|
||||
WindowSettings::new("Hello Virtual World!", [512; 2])
|
||||
.exit_on_esc(true)
|
||||
.vsync(false)
|
||||
.build().expect("Building Window");
|
||||
|
||||
let pso = window.factory.create_pipeline_simple(VERTEX_SHADER_SRC,
|
||||
FRAGMENT_SHADER_SRC,
|
||||
pipe::new())
|
||||
.expect("create pipeline");
|
||||
|
||||
let (tex_left, tgt_left, depth_left) = vr::create_eyebuffer(&mut window.factory, render_size)
|
||||
.expect("create left renderbuffer");
|
||||
let (tex_right, tgt_right, depth_right) = vr::create_eyebuffer(&mut window.factory, render_size)
|
||||
.expect("create right renderbuffer");
|
||||
let (vertex_buffer, slice) = window.factory.create_vertex_buffer_with_slice(&POLYGON, POLYGON_IDX);
|
||||
|
||||
let tiles = tile::get_tiles::<_, _, ColorFormat>(&mut window.factory);
|
||||
let nn_sampler = window.factory.create_sampler(
|
||||
tex::SamplerInfo::new(tex::FilterMethod::Scale,
|
||||
tex::WrapMode::Clamp));
|
||||
|
||||
let pipe_monitor = pipe::Data {
|
||||
vbuf: vertex_buffer.clone(),
|
||||
trans: window.factory.create_constant_buffer(1),
|
||||
tiles: (tiles.clone(), nn_sampler.clone()),
|
||||
pixcolor: window.output_color.clone(),
|
||||
depth: window.output_stencil.clone(),
|
||||
};
|
||||
let pipe_left = pipe::Data {
|
||||
vbuf: vertex_buffer.clone(),
|
||||
trans: window.factory.create_constant_buffer(1),
|
||||
tiles: (tiles.clone(), nn_sampler.clone()),
|
||||
pixcolor: tgt_left,
|
||||
depth: depth_left,
|
||||
};
|
||||
let pipe_right = pipe::Data {
|
||||
vbuf: vertex_buffer.clone(),
|
||||
trans: window.factory.create_constant_buffer(1),
|
||||
tiles: (tiles.clone(), nn_sampler.clone()),
|
||||
pixcolor: tgt_right,
|
||||
depth: depth_right,
|
||||
};
|
||||
window.encoder.update_constant_buffer(
|
||||
&pipe_monitor.trans,
|
||||
&Trans { matrix: *na::Matrix4::one().as_ref() });
|
||||
|
||||
let mut frame = 0u32;
|
||||
window.window.swap_buffers(); frame += 1; // To contain setup calls to Frame 0 in apitrace
|
||||
'main:
|
||||
//while let Some(_) = window.next() {
|
||||
loop {
|
||||
info!("Frame #{}", frame);
|
||||
let _now = std::time::SystemTime::now();
|
||||
|
||||
// Get the current sensor state
|
||||
let poses = vr.poses();
|
||||
trace!("\t{:?} got pose", _now.elapsed());
|
||||
if frame % 90 == 0 {
|
||||
debug!("\t#{}: poses:", frame);
|
||||
let mut devnum = 0;
|
||||
for track in (0..poses.count).map(|pose| poses.poses[pose]) {
|
||||
match track.device_class() {
|
||||
vr::TrackedDeviceClass::Invalid => (),
|
||||
_ => debug!("\t\t#{}: {:?} = valid? {}, connected? {}\n\t\t\t{:?}\n\t\t\t{:?}",
|
||||
devnum,
|
||||
track.device_class(),
|
||||
track.is_valid,
|
||||
track.is_connected,
|
||||
track.to_device,
|
||||
track.velocity)
|
||||
}
|
||||
devnum += 1;
|
||||
}
|
||||
debug!("");
|
||||
}
|
||||
frame += 1;
|
||||
|
||||
let mut hmd_mat = poses.poses[0].to_device.as_matrix4();
|
||||
hmd_mat.inverse_mut();
|
||||
|
||||
for pass in [(Some((vr::Eye::Left, &tex_left)), &pipe_left),
|
||||
(Some((vr::Eye::Right, &tex_right)), &pipe_right),
|
||||
(None, &pipe_monitor),]
|
||||
.into_iter() {
|
||||
info!("\tpass for eye: {:?}", pass.0);
|
||||
window.encoder.clear(&pass.1.pixcolor, [0.1, 0.2, 0.3, 1.0]);
|
||||
window.encoder.clear_depth(&pass.1.depth, 1.0);
|
||||
|
||||
// Submit eye textures
|
||||
if let Some((eye, tex)) = pass.0 {
|
||||
let proj_mat = vr.projection_matrix(eye, NEAR, FAR);
|
||||
let eye_mat = vr.head_to_eye_transform(eye);
|
||||
for track in (0..poses.count).map(|pose| poses.poses[pose]) {
|
||||
match track.device_class() {
|
||||
vr::TrackedDeviceClass::Controller |
|
||||
vr::TrackedDeviceClass::TrackingReference => {
|
||||
let model_mat = track.to_device.as_matrix4();
|
||||
|
||||
let trans = Trans { matrix: *(proj_mat * eye_mat * hmd_mat * model_mat).as_ref() };
|
||||
window.encoder.update_constant_buffer(&pass.1.trans, &trans);
|
||||
|
||||
window.encoder.draw(&slice, &pso, pass.1);
|
||||
window.encoder.flush(&mut window.device);
|
||||
},
|
||||
_ => ()
|
||||
}
|
||||
}
|
||||
|
||||
vr.submit(eye, tex);
|
||||
trace!("\t\t{:?} submit {:?}", _now.elapsed(), eye);
|
||||
} else {
|
||||
window.encoder.draw(&slice, &pso, pass.1);
|
||||
window.encoder.flush(&mut window.device);
|
||||
window.window.swap_buffers();
|
||||
}
|
||||
}
|
||||
window.device.cleanup();
|
||||
|
||||
// handle window events
|
||||
while let Some(ev) = window.poll_event() {
|
||||
match ev {
|
||||
piston_window::Input::Text(_) => break 'main,
|
||||
_ => debug!("\t{:?}", ev)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
debug!("shutting down");
|
||||
}
|
||||
|
||||
const VERTEX_SHADER_SRC: &'static [u8] = br#"
|
||||
#version 140
|
||||
|
||||
in vec3 a_pos;
|
||||
in vec2 a_uv;
|
||||
out vec3 v_color;
|
||||
out vec2 v_uv;
|
||||
uniform b_trans {
|
||||
mat4 u_matrix;
|
||||
};
|
||||
|
||||
void main() {
|
||||
v_uv = a_uv;
|
||||
gl_Position = u_matrix * vec4(a_pos, 1.0);
|
||||
}
|
||||
"#;
|
||||
|
||||
const FRAGMENT_SHADER_SRC: &'static [u8] = br#"
|
||||
#version 140
|
||||
|
||||
in vec3 v_color;
|
||||
in vec2 v_uv;
|
||||
out vec4 pixcolor;
|
||||
uniform sampler2D t_tiles;
|
||||
|
||||
void main() {
|
||||
vec2 uv = vec2(v_uv.x, 31.0 / 256 + (1.0 - v_uv.y) / 256.0);
|
||||
pixcolor = texture(t_tiles, uv);
|
||||
}
|
||||
"#;
|
||||
40
src/bin/vrtue.rs
Normal file
40
src/bin/vrtue.rs
Normal file
@@ -0,0 +1,40 @@
|
||||
extern crate vrtue;
|
||||
use vrtue::{view, vr};
|
||||
|
||||
extern crate env_logger;
|
||||
extern crate gfx_device_gl;
|
||||
#[macro_use] extern crate log;
|
||||
extern crate piston_window;
|
||||
|
||||
use self::piston_window::{PistonWindow, Window, WindowSettings};
|
||||
|
||||
pub fn main() {
|
||||
env_logger::init().expect("env logger");
|
||||
let mut vr = vr::VR::new().expect("VR init");
|
||||
|
||||
let mut window: PistonWindow =
|
||||
WindowSettings::new("Hello Virtual World!", [512; 2])
|
||||
.exit_on_esc(true)
|
||||
.vsync(false)
|
||||
.build().expect("Building Window");
|
||||
|
||||
let view = view::ViewRoot::<gfx_device_gl::Device,
|
||||
view::ColorFormat,
|
||||
view::DepthFormat>::create_view(&mut window, &mut vr);
|
||||
|
||||
'main:
|
||||
//while let Some(_) = window.next() {
|
||||
loop {
|
||||
view.draw(&mut window, &mut vr);
|
||||
|
||||
// handle window events
|
||||
while let Some(ev) = window.poll_event() {
|
||||
match ev {
|
||||
piston_window::Input::Text(_) => break 'main,
|
||||
_ => debug!("\t{:?}", ev)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
debug!("shutting down");
|
||||
}
|
||||
Reference in New Issue
Block a user