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

Fix SVG and demo compilation errors

This commit is contained in:
Patrick Walton 2019-05-13 18:19:10 -07:00
parent f24d93819b
commit c09ef3ae7c
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/common/src/camera.rs
View File

@ -56,7 +56,7 @@ impl Camera {
let scale = i32::min(viewport_size.x(), viewport_size.y()) as f32 let scale = i32::min(viewport_size.x(), viewport_size.y()) as f32
* scale_factor_for_view_box(view_box); * scale_factor_for_view_box(view_box);
let origin = viewport_size.to_f32().scale(0.5) - view_box.size().scale(scale * 0.5); let origin = viewport_size.to_f32().scale(0.5) - view_box.size().scale(scale * 0.5);
Camera::TwoD(Transform2DF32::from_scale(&Point2DF32::splat(scale)).post_translate(origin)) Camera::TwoD(Transform2DF32::from_scale(Point2DF32::splat(scale)).post_translate(origin))
} }
fn new_3d(mode: Mode, view_box: RectF32, viewport_size: Point2DI32) -> Camera { fn new_3d(mode: Mode, view_box: RectF32, viewport_size: Point2DI32) -> Camera {

11
svg/src/lib.rs
View File

@ -313,8 +313,7 @@ where
} }
UsvgPathSegment::LineTo { x, y } => { UsvgPathSegment::LineTo { x, y } => {
let to = Point2DF32::new(x as f32, y as f32); let to = Point2DF32::new(x as f32, y as f32);
let mut segment = let mut segment = Segment::line(&LineSegmentF32::new(self.last_subpath_point, to));
Segment::line(&LineSegmentF32::new(&self.last_subpath_point, &to));
if self.just_moved { if self.just_moved {
segment.flags.insert(SegmentFlags::FIRST_IN_SUBPATH); segment.flags.insert(SegmentFlags::FIRST_IN_SUBPATH);
} }
@ -334,8 +333,8 @@ where
let ctrl1 = Point2DF32::new(x2 as f32, y2 as f32); let ctrl1 = Point2DF32::new(x2 as f32, y2 as f32);
let to = Point2DF32::new(x as f32, y as f32); let to = Point2DF32::new(x as f32, y as f32);
let mut segment = Segment::cubic( let mut segment = Segment::cubic(
&LineSegmentF32::new(&self.last_subpath_point, &to), &LineSegmentF32::new(self.last_subpath_point, to),
&LineSegmentF32::new(&ctrl0, &ctrl1), &LineSegmentF32::new(ctrl0, ctrl1),
); );
if self.just_moved { if self.just_moved {
segment.flags.insert(SegmentFlags::FIRST_IN_SUBPATH); segment.flags.insert(SegmentFlags::FIRST_IN_SUBPATH);
@ -346,8 +345,8 @@ where
} }
UsvgPathSegment::ClosePath => { UsvgPathSegment::ClosePath => {
let mut segment = Segment::line(&LineSegmentF32::new( let mut segment = Segment::line(&LineSegmentF32::new(
&self.last_subpath_point, self.last_subpath_point,
&self.first_subpath_point, self.first_subpath_point,
)); ));
segment.flags.insert(SegmentFlags::CLOSES_SUBPATH); segment.flags.insert(SegmentFlags::CLOSES_SUBPATH);
self.just_moved = false; self.just_moved = false;