fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-16 06:38:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Polish a few things (#81)

Browse Source 
* Implement/suppress various compiler/clippy lints

* Change `tool_init` to take `ToolType` by value

* Factor out error conversion into a function

* Consume parameters with `todo`

* Make `workspace` stuff public

Making them public also removes the warnings
without having to suppress them.

Also, this commit removes the unused import of
`EditorError`

* Remove allow(unused_variables), use vars in `todo`

Also implements `Debug` on `DocumentToolData`
This commit is contained in:
T0mstone
2021-04-22 17:05:25 +02:00
committed by Keavon Chambers
parent 87ed3a1bbd
commit b556dd6bfd
11 changed files with 54 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/document/src/shape_points.rs
View File

@@ -17,7 +17,7 @@ impl ShapePoints {
ShapePoints {
center: center.into(),
extent: extent.into(),
sides: sides,
sides,
}
}
@@ -36,7 +36,7 @@ impl ShapePoints {
// Gets the length of one side
#[inline]
pub fn side_length(&self) -> f64 {
self.apothem_offset_angle().sin() * (self.sides as f64) * (2 as f64)
self.apothem_offset_angle().sin() * (self.sides as f64) * 2f64
}
}
@@ -45,7 +45,7 @@ impl std::fmt::Display for ShapePoints {
fn rotate(v: &Vec2, theta: f64) -> Vec2 {
let cosine = theta.cos();
let sine = theta.sin();
return Vec2::new(v.x * cosine - v.y * sine, v.x * sine + v.y * cosine);
Vec2::new(v.x * cosine - v.y * sine, v.x * sine + v.y * cosine)
}
info!("sides{}", self.sides);
for i in 0..self.sides {
@@ -72,7 +72,7 @@ impl Iterator for ShapePathIter {
fn rotate(v: &Vec2, theta: f64) -> Vec2 {
let cosine = theta.cos();
let sine = theta.sin();
return Vec2::new(v.x * cosine - v.y * sine, v.x * sine + v.y * cosine);
Vec2::new(v.x * cosine - v.y * sine, v.x * sine + v.y * cosine)
}
self.ix += 1;
match self.ix {
@@ -102,9 +102,9 @@ impl Add<Vec2> for ShapePoints {
impl kurbo::Shape for ShapePoints {
type PathElementsIter = ShapePathIter;
#[inline]
fn perimeter(&self, _accuracy: f64) -> f64 {
self.side_length() * (self.sides as f64)
fn path_elements(&self, _tolerance: f64) -> Self::PathElementsIter {
todo!()
}
#[inline]
@@ -112,8 +112,9 @@ impl kurbo::Shape for ShapePoints {
self.apothem() * self.perimeter(2.1)
}
fn path_elements(&self, _tolerance: f64) -> Self::PathElementsIter {
todo!()
#[inline]
fn perimeter(&self, _accuracy: f64) -> f64 {
self.side_length() * (self.sides as f64)
}
fn winding(&self, _pt: Point) -> i32 {