Renamed Point2D to Vector2
This commit is contained in:
parent
c71a20805f
commit
9c641f6ce3
|
@ -29,8 +29,8 @@ use pathfinder_demo::BackgroundColor;
|
||||||
use pathfinder_demo::Mode;
|
use pathfinder_demo::Mode;
|
||||||
use pathfinder_demo::window::Event;
|
use pathfinder_demo::window::Event;
|
||||||
use pathfinder_demo::window::SVGPath;
|
use pathfinder_demo::window::SVGPath;
|
||||||
use pathfinder_geometry::basic::point::Point2DF;
|
use pathfinder_geometry::basic::vector::Vector2F;
|
||||||
use pathfinder_geometry::basic::point::Point2DI;
|
use pathfinder_geometry::basic::vector::Vector2I;
|
||||||
use pathfinder_geometry::basic::rect::RectI;
|
use pathfinder_geometry::basic::rect::RectI;
|
||||||
use pathfinder_geometry::basic::transform2d::Transform2DF;
|
use pathfinder_geometry::basic::transform2d::Transform2DF;
|
||||||
use pathfinder_geometry::color::ColorF;
|
use pathfinder_geometry::color::ColorF;
|
||||||
|
@ -190,10 +190,10 @@ pub unsafe extern "C" fn magicleap_pathfinder_render(pf: *mut c_void, options: *
|
||||||
let mut height = 0;
|
let mut height = 0;
|
||||||
egl::query_surface(options.display, options.surface, egl::EGL_WIDTH, &mut width);
|
egl::query_surface(options.display, options.surface, egl::EGL_WIDTH, &mut width);
|
||||||
egl::query_surface(options.display, options.surface, egl::EGL_HEIGHT, &mut height);
|
egl::query_surface(options.display, options.surface, egl::EGL_HEIGHT, &mut height);
|
||||||
let size = Point2DI::new(width, height);
|
let size = Vector2I::new(width, height);
|
||||||
|
|
||||||
let viewport_origin = Point2DI::new(options.viewport[0] as i32, options.viewport[1] as i32);
|
let viewport_origin = Vector2I::new(options.viewport[0] as i32, options.viewport[1] as i32);
|
||||||
let viewport_size = Point2DI::new(options.viewport[2] as i32, options.viewport[3] as i32);
|
let viewport_size = Vector2I::new(options.viewport[2] as i32, options.viewport[3] as i32);
|
||||||
let viewport = RectI::new(viewport_origin, viewport_size);
|
let viewport = RectI::new(viewport_origin, viewport_size);
|
||||||
|
|
||||||
let bg_color = ColorF(F32x4::new(options.bg_color[0], options.bg_color[1], options.bg_color[2], options.bg_color[3]));
|
let bg_color = ColorF(F32x4::new(options.bg_color[0], options.bg_color[1], options.bg_color[2], options.bg_color[3]));
|
||||||
|
@ -216,12 +216,12 @@ pub unsafe extern "C" fn magicleap_pathfinder_render(pf: *mut c_void, options: *
|
||||||
let scale = i32::min(viewport_size.x(), viewport_size.y()) as f32 /
|
let scale = i32::min(viewport_size.x(), viewport_size.y()) as f32 /
|
||||||
f32::max(svg.scene.bounds().size().x(), svg.scene.bounds().size().y());
|
f32::max(svg.scene.bounds().size().x(), svg.scene.bounds().size().y());
|
||||||
let transform = Transform2DF::from_translation(svg.scene.bounds().size().scale(-0.5))
|
let transform = Transform2DF::from_translation(svg.scene.bounds().size().scale(-0.5))
|
||||||
.post_mul(&Transform2DF::from_scale(Point2DF::splat(scale)))
|
.post_mul(&Transform2DF::from_scale(Vector2F::splat(scale)))
|
||||||
.post_mul(&Transform2DF::from_translation(viewport_size.to_f32().scale(0.5)));
|
.post_mul(&Transform2DF::from_translation(viewport_size.to_f32().scale(0.5)));
|
||||||
|
|
||||||
let render_options = RenderOptions {
|
let render_options = RenderOptions {
|
||||||
transform: RenderTransform::Transform2D(transform),
|
transform: RenderTransform::Transform2D(transform),
|
||||||
dilation: Point2DF::default(),
|
dilation: Vector2F::default(),
|
||||||
subpixel_aa_enabled: false,
|
subpixel_aa_enabled: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -48,8 +48,8 @@ use pathfinder_demo::window::OcularTransform;
|
||||||
use pathfinder_demo::window::View;
|
use pathfinder_demo::window::View;
|
||||||
use pathfinder_demo::window::Window;
|
use pathfinder_demo::window::Window;
|
||||||
use pathfinder_demo::window::WindowSize;
|
use pathfinder_demo::window::WindowSize;
|
||||||
use pathfinder_geometry::basic::point::Point2DI;
|
use pathfinder_geometry::basic::vector::Vector2I;
|
||||||
use pathfinder_geometry::basic::point::Point2DF;
|
use pathfinder_geometry::basic::vector::Vector2F;
|
||||||
use pathfinder_geometry::basic::rect::RectF;
|
use pathfinder_geometry::basic::rect::RectF;
|
||||||
use pathfinder_geometry::basic::rect::RectI;
|
use pathfinder_geometry::basic::rect::RectI;
|
||||||
use pathfinder_geometry::basic::transform3d::Perspective;
|
use pathfinder_geometry::basic::transform3d::Perspective;
|
||||||
|
@ -75,7 +75,7 @@ use std::time::Duration;
|
||||||
pub struct MagicLeapWindow {
|
pub struct MagicLeapWindow {
|
||||||
framebuffer_id: GLuint,
|
framebuffer_id: GLuint,
|
||||||
graphics_client: MLHandle,
|
graphics_client: MLHandle,
|
||||||
size: Point2DI,
|
size: Vector2I,
|
||||||
virtual_camera_array: MLGraphicsVirtualCameraInfoArray,
|
virtual_camera_array: MLGraphicsVirtualCameraInfoArray,
|
||||||
initial_camera_transform: Option<Transform3DF>,
|
initial_camera_transform: Option<Transform3DF>,
|
||||||
frame_handle: MLHandle,
|
frame_handle: MLHandle,
|
||||||
|
@ -117,7 +117,7 @@ impl Window for MagicLeapWindow {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn viewport(&self, _view: View) -> RectI {
|
fn viewport(&self, _view: View) -> RectI {
|
||||||
RectI::new(Point2DI::default(), self.size)
|
RectI::new(Vector2I::default(), self.size)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn make_current(&mut self, view: View) {
|
fn make_current(&mut self, view: View) {
|
||||||
|
@ -184,7 +184,7 @@ impl MagicLeapWindow {
|
||||||
MagicLeapWindow {
|
MagicLeapWindow {
|
||||||
framebuffer_id,
|
framebuffer_id,
|
||||||
graphics_client,
|
graphics_client,
|
||||||
size: Point2DI::new(max_width, max_height),
|
size: Vector2I::new(max_width, max_height),
|
||||||
frame_handle: ML_HANDLE_INVALID,
|
frame_handle: ML_HANDLE_INVALID,
|
||||||
virtual_camera_array,
|
virtual_camera_array,
|
||||||
initial_camera_transform: None,
|
initial_camera_transform: None,
|
||||||
|
@ -370,7 +370,7 @@ impl From<MLVec3f> for Transform3DF {
|
||||||
|
|
||||||
impl From<MLRectf> for RectF {
|
impl From<MLRectf> for RectF {
|
||||||
fn from(r: MLRectf) -> Self {
|
fn from(r: MLRectf) -> Self {
|
||||||
RectF::new(Point2DF::new(r.x, r.y), Point2DF::new(r.w, r.h))
|
RectF::new(Vector2F::new(r.x, r.y), Vector2F::new(r.w, r.h))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue