forked from M-Labs/nalgebra
Use From
trait to convert glam types to arrays.
This commit is contained in:
parent
1e31e6ba69
commit
238750fb30
6
src/third_party/glam/common/glam_matrix.rs
vendored
6
src/third_party/glam/common/glam_matrix.rs
vendored
@ -14,7 +14,7 @@ macro_rules! impl_vec_conversion(
|
||||
impl From<$Vec2> for Vector2<$N> {
|
||||
#[inline]
|
||||
fn from(e: $Vec2) -> Vector2<$N> {
|
||||
(*e.as_ref()).into()
|
||||
<[$N;2]>::from(e).into()
|
||||
}
|
||||
}
|
||||
|
||||
@ -31,7 +31,7 @@ macro_rules! impl_vec_conversion(
|
||||
impl From<$Vec3> for Vector3<$N> {
|
||||
#[inline]
|
||||
fn from(e: $Vec3) -> Vector3<$N> {
|
||||
(*e.as_ref()).into()
|
||||
<[$N;3]>::from(e).into()
|
||||
}
|
||||
}
|
||||
|
||||
@ -48,7 +48,7 @@ macro_rules! impl_vec_conversion(
|
||||
impl From<$Vec4> for Vector4<$N> {
|
||||
#[inline]
|
||||
fn from(e: $Vec4) -> Vector4<$N> {
|
||||
(*e.as_ref()).into()
|
||||
<[$N;4]>::from(e).into()
|
||||
}
|
||||
}
|
||||
|
||||
|
6
src/third_party/glam/common/glam_point.rs
vendored
6
src/third_party/glam/common/glam_point.rs
vendored
@ -9,7 +9,7 @@ macro_rules! impl_point_conversion(
|
||||
impl From<$Vec2> for Point2<$N> {
|
||||
#[inline]
|
||||
fn from(e: $Vec2) -> Point2<$N> {
|
||||
(*e.as_ref()).into()
|
||||
<[$N;2]>::from(e).into()
|
||||
}
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@ macro_rules! impl_point_conversion(
|
||||
impl From<$Vec3> for Point3<$N> {
|
||||
#[inline]
|
||||
fn from(e: $Vec3) -> Point3<$N> {
|
||||
(*e.as_ref()).into()
|
||||
<[$N;3]>::from(e).into()
|
||||
}
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ macro_rules! impl_point_conversion(
|
||||
impl From<$Vec4> for Point4<$N> {
|
||||
#[inline]
|
||||
fn from(e: $Vec4) -> Point4<$N> {
|
||||
(*e.as_ref()).into()
|
||||
<[$N;4]>::from(e).into()
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user