Skip to content

Commit

Permalink
Merge pull request #583 from Limeth/master
Browse files Browse the repository at this point in the history
Add conversion functions to Size and Vector
  • Loading branch information
hecrj authored Oct 29, 2020
2 parents b882596 + 16646ff commit 820abdc
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 0 deletions.
16 changes: 16 additions & 0 deletions core/src/size.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use crate::Vector;
use std::f32;

/// An amount of space in 2 dimensions.
Expand Down Expand Up @@ -57,8 +58,23 @@ impl From<[u16; 2]> for Size {
}
}

impl From<Vector<f32>> for Size {
fn from(vector: Vector<f32>) -> Self {
Size {
width: vector.x,
height: vector.y,
}
}
}

impl From<Size> for [f32; 2] {
fn from(size: Size) -> [f32; 2] {
[size.width, size.height]
}
}

impl From<Size> for Vector<f32> {
fn from(size: Size) -> Self {
Vector::new(size.width, size.height)
}
}
15 changes: 15 additions & 0 deletions core/src/vector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,18 @@ where
}
}
}

impl<T> From<[T; 2]> for Vector<T> {
fn from([x, y]: [T; 2]) -> Self {
Self::new(x, y)
}
}

impl<T> From<Vector<T>> for [T; 2]
where
T: Copy,
{
fn from(other: Vector<T>) -> Self {
[other.x, other.y]
}
}

0 comments on commit 820abdc

Please sign in to comment.