Merge pull request #1085 from hannobraun/math

Fix `Vector::unit_v`
hannobraun · Sep 14, 2022 · 6f60add · 6f60add
2 parents e1c1d5f + 417da29
commit 6f60add
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/crates/fj-math/src/scalar.rs b/crates/fj-math/src/scalar.rs
@@ -88,8 +88,8 @@ impl Scalar {
     }
 
     /// Compute the maximum of this and another scalar
-    pub fn max(self, other: Self) -> Self {
-        self.0.max(other.0).into()
+    pub fn max(self, other: impl Into<Self>) -> Self {
+        self.0.max(other.into().0).into()
     }
 
     /// Compute the smallest integer larger than or equal to this scalar

diff --git a/crates/fj-math/src/vector.rs b/crates/fj-math/src/vector.rs
@@ -125,7 +125,7 @@ impl Vector<2> {
 
     /// Construct a `Vector` that represents the v-axis
     pub fn unit_v() -> Self {
-        Vector::from([1., 0.])
+        Vector::from([0., 1.])
     }
 
     /// Compute the 2D cross product with another vector