michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update for current Window interface

This commit is contained in:
Alan Jeffrey 2019-04-09 14:35:52 -05:00 committed by Josh Matthews
parent bd70cb0135
commit 41dc655967
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demo/magicleap/src/lib.rs
View File

@ -15,6 +15,7 @@ use log::info;
use pathfinder_demo::Background;
use pathfinder_demo::DemoApp;
use pathfinder_demo::Options;
use pathfinder_demo::UIVisibility;
use pathfinder_demo::window::Event;
use pathfinder_demo::window::Mode;
use pathfinder_demo::window::SVGPath;
@ -77,11 +78,11 @@ pub unsafe extern "C" fn magicleap_pathfinder_demo_init(egl_display: EGLDisplay,
let window_size = window.size();
let mut options = Options::default();
options.ui = false;
options.ui = UIVisibility::None;
options.background = Background::None;
options.mode = Mode::VR;
options.jobs = Some(3);
options.pipeline = 0;
options.pipeline = false;
let demo = DemoApp::new(window, window_size, options);
info!("Initialized app");
@ -225,6 +226,7 @@ pub unsafe extern "C" fn magicleap_pathfinder_render(pf: *mut c_void, options: *
transform: RenderTransform::Transform2D(transform),
dilation: Point2DF32::default(),
barrel_distortion: None,
subpixel_aa_enabled: false,
};
let built_options = render_options.prepare(svg.scene.bounds);

10
demo/magicleap/src/magicleap.rs
View File

@ -101,7 +101,7 @@ impl Window for MagicLeapWindow {
self.framebuffer_id
}
fn customize_rayon(&self, thread_pool_builder: ThreadPoolBuilder) -> ThreadPoolBuilder {
fn adjust_thread_pool_settings(&self, thread_pool_builder: ThreadPoolBuilder) -> ThreadPoolBuilder {
thread_pool_builder.start_handler(|id| unsafe { init_scene_thread(id) })
}
@ -123,7 +123,7 @@ impl Window for MagicLeapWindow {
Err(())
}
fn view_box_size(&self, _mode: Mode, _subpixel_aa: bool) -> Point2DI32 {
fn view_box_size(&self, _mode: Mode) -> Point2DI32 {
self.size
}
@ -131,7 +131,7 @@ impl Window for MagicLeapWindow {
BarrelDistortionCoefficients { k0: 0.0, k1: 0.0 }
}
fn make_current(&mut self, _mode: Mode, _subpixel_aa: bool, eye: Option<u32>) -> RectI32 {
fn make_current(&mut self, _mode: Mode, eye: Option<u32>) -> RectI32 {
self.begin_frame();
let eye = match eye {
Some(eye) if (eye as usize) < ML_VIRTUAL_CAMERA_COUNT => eye as usize,
@ -337,11 +337,11 @@ impl Window for MagicLeapLandscape {
Err(())
}
fn view_box_size(&self, _mode: Mode, _subpixel_aa: bool) -> Point2DI32 {
fn view_box_size(&self, _mode: Mode) -> Point2DI32 {
self.size
}
fn make_current(&mut self, _mode: Mode, _subpixel_aa: bool, _eye: Option<u32>) -> RectI32 {
fn make_current(&mut self, _mode: Mode, _eye: Option<u32>) -> RectI32 {
RectI32::new(Point2DI32::new(0, 0), self.size)
}