Auto merge of #305 - nical:clamp, r=kvark

Implement clamp for vectors, points and size

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/euclid/305)
<!-- Reviewable:end -->

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "euclid"
-version = "0.19.1"
+version = "0.19.2"
 authors = ["The Servo Project Developers"]
 description = "Geometry primitives"
 documentation = "https://docs.rs/euclid/"

src/point.rs

@@ -198,6 +198,11 @@ impl<T: Float, U> TypedPoint2D<T, U> {
     pub fn max(self, other: Self) -> Self {
         point2(self.x.max(other.x), self.y.max(other.y))
     }
+
+    #[inline]
+    pub fn clamp(&self, start: Self, end: Self) -> Self {
+        self.max(start).min(end)
+    }
 }
 
 impl<T: Copy + Mul<T, Output = T>, U> Mul<T> for TypedPoint2D<T, U> {
@@ -621,6 +626,11 @@ impl<T: Float, U> TypedPoint3D<T, U> {
             self.z.max(other.z),
         )
     }
+
+    #[inline]
+    pub fn clamp(&self, start: Self, end: Self) -> Self {
+        self.max(start).min(end)
+    }
 }
 
 impl<T: Round, U> TypedPoint3D<T, U> {

src/size.rs

@@ -15,7 +15,7 @@ use scale::TypedScale;
 use vector::{TypedVector2D, vec2, BoolVector2D};
 use num::*;
 
-use num_traits::{NumCast, Signed};
+use num_traits::{Float, NumCast, Signed};
 use core::fmt;
 use core::ops::{Add, Div, Mul, Sub};
 use core::marker::PhantomData;
@@ -329,6 +329,30 @@ impl<T: PartialEq, U> TypedSize2D<T, U> {
     }
 }
 
+impl<T: Float, U> TypedSize2D<T, U> {
+    #[inline]
+    pub fn min(self, other: Self) -> Self {
+        size2(
+            self.width.min(other.width),
+            self.height.min(other.height),
+        )
+    }
+
+    #[inline]
+    pub fn max(self, other: Self) -> Self {
+        size2(
+            self.width.max(other.width),
+            self.height.max(other.height),
+        )
+    }
+
+    #[inline]
+    pub fn clamp(&self, start: Self, end: Self) -> Self {
+        self.max(start).min(end)
+    }
+}
+
+
 /// Shorthand for `TypedSize2D::new(w, h)`.
 pub fn size2<T, U>(w: T, h: T) -> TypedSize2D<T, U> {
     TypedSize2D::new(w, h)

src/vector.rs

@@ -262,6 +262,11 @@ impl<T: Float, U> TypedVector2D<T, U> {
     pub fn max(self, other: Self) -> Self {
         vec2(self.x.max(other.x), self.y.max(other.y))
     }
+
+    #[inline]
+    pub fn clamp(&self, start: Self, end: Self) -> Self {
+        self.max(start).min(end)
+    }
 }
 
 impl<T: Copy + Mul<T, Output = T>, U> Mul<T> for TypedVector2D<T, U> {
@@ -746,6 +751,11 @@ impl<T: Float, U> TypedVector3D<T, U> {
             self.z.max(other.z),
         )
     }
+
+    #[inline]
+    pub fn clamp(&self, start: Self, end: Self) -> Self {
+        self.max(start).min(end)
+    }
 }
 
 impl<T: Copy + Mul<T, Output = T>, U1, U2> Mul<TypedScale<T, U1, U2>> for TypedVector3D<T, U1> {
@@ -1376,6 +1386,17 @@ mod vector3d {
         assert_eq!(result, vec3(2.0, 3.0, 5.0));
     }
 
+    #[test]
+    pub fn test_clamp() {
+        let p1: Vec3 = vec3(1.0, -1.0, 5.0);
+        let p2: Vec3 = vec3(2.0, 5.0, 10.0);
+        let p3: Vec3 = vec3(-1.0, 2.0, 20.0);
+
+        let result = p3.clamp(p1, p2);
+
+        assert_eq!(result, vec3(1.0, 2.0, 10.0));
+    }
+
     #[test]
     pub fn test_scalar_mul() {
         enum Mm {}