From 34da833e39b6fedb0c015cee291b75614cf4cdc3 Mon Sep 17 00:00:00 2001
From: Osspial <osspial@gmail.com>
Date: Sat, 20 Jan 2018 23:54:59 -0500
Subject: [PATCH 1/2] Add map functions to points and vectors

---
 src/point.rs  | 54 +++++++++++++++++++++++++--------------------------
 src/vector.rs |  7 +++++++
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/point.rs b/src/point.rs
index 337e67b..1291495 100644
--- a/src/point.rs
+++ b/src/point.rs
@@ -64,33 +64,6 @@ pub struct Point3<S> {
     pub z: S,
 }
 
-impl<S: BaseNum> Point1<S> {
-    #[inline]
-    pub fn new(x: S) -> Point1<S> {
-        Point1 { x: x }
-    }
-
-    impl_swizzle_functions!(Point1, Point2, Point3, S, x);
-}
-
-impl<S: BaseNum> Point2<S> {
-    #[inline]
-    pub fn new(x: S, y: S) -> Point2<S> {
-        Point2 { x: x, y: y }
-    }
-
-    impl_swizzle_functions!(Point1, Point2, Point3, S, xy);
-}
-
-impl<S: BaseNum> Point3<S> {
-    #[inline]
-    pub fn new(x: S, y: S, z: S) -> Point3<S> {
-        Point3 { x: x, y: y, z: z }
-    }
-
-    impl_swizzle_functions!(Point1, Point2, Point3, S, xyz);
-}
-
 impl<S: BaseNum> Point3<S> {
     #[inline]
     pub fn from_homogeneous(v: Vector4<S>) -> Point3<S> {
@@ -106,6 +79,21 @@ impl<S: BaseNum> Point3<S> {
 
 macro_rules! impl_point {
     ($PointN:ident { $($field:ident),+ }, $VectorN:ident, $n:expr) => {
+        impl<S> $PointN<S> {
+            /// Construct a new vector, using the provided values.
+            #[inline]
+            pub fn new($($field: S),+) -> $PointN<S> {
+                $PointN { $($field: $field),+ }
+            }
+
+            #[inline]
+            pub fn map<U, F>(self, mut f: F) -> $PointN<U>
+                where F: FnMut(S) -> U
+            {
+                $PointN { $($field: f(self.$field)),+ }
+            }
+        }
+
         impl<S: BaseNum> Array for $PointN<S> {
             type Element = S;
 
@@ -322,6 +310,18 @@ impl_point!(Point1 { x }, Vector1, 1);
 impl_point!(Point2 { x, y }, Vector2, 2);
 impl_point!(Point3 { x, y, z }, Vector3, 3);
 
+impl<S: Copy> Point1<S> {
+    impl_swizzle_functions!(Point1, Point2, Point3, S, x);
+}
+
+impl<S: Copy> Point2<S> {
+    impl_swizzle_functions!(Point1, Point2, Point3, S, xy);
+}
+
+impl<S: Copy> Point3<S> {
+    impl_swizzle_functions!(Point1, Point2, Point3, S, xyz);
+}
+
 impl_fixed_array_conversions!(Point1<S> { x: 0 }, 1);
 impl_fixed_array_conversions!(Point2<S> { x: 0, y: 1 }, 2);
 impl_fixed_array_conversions!(Point3<S> { x: 0, y: 1, z: 2 }, 3);
diff --git a/src/vector.rs b/src/vector.rs
index 8dfcb09..4f111ac 100644
--- a/src/vector.rs
+++ b/src/vector.rs
@@ -101,6 +101,13 @@ macro_rules! impl_vector {
             pub fn new($($field: S),+) -> $VectorN<S> {
                 $VectorN { $($field: $field),+ }
             }
+
+            #[inline]
+            pub fn map<U, F>(self, mut f: F) -> $VectorN<U>
+                where F: FnMut(S) -> U
+            {
+                $VectorN { $($field: f(self.$field)),+ }
+            }
         }
 
         /// The short constructor.

From def53ca3719cbe5c78cec54aabee477538ec6981 Mon Sep 17 00:00:00 2001
From: Osspial <osspial@gmail.com>
Date: Fri, 16 Mar 2018 16:32:46 -0400
Subject: [PATCH 2/2] Fix some documentation

---
 src/point.rs  | 4 +++-
 src/vector.rs | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/point.rs b/src/point.rs
index 1291495..df5a299 100644
--- a/src/point.rs
+++ b/src/point.rs
@@ -80,12 +80,14 @@ impl<S: BaseNum> Point3<S> {
 macro_rules! impl_point {
     ($PointN:ident { $($field:ident),+ }, $VectorN:ident, $n:expr) => {
         impl<S> $PointN<S> {
-            /// Construct a new vector, using the provided values.
+            /// Construct a new point, using the provided values.
             #[inline]
             pub fn new($($field: S),+) -> $PointN<S> {
                 $PointN { $($field: $field),+ }
             }
 
+            /// Perform the given operation on each field in the point, returning a new point
+            /// constructed from the operations.
             #[inline]
             pub fn map<U, F>(self, mut f: F) -> $PointN<U>
                 where F: FnMut(S) -> U
diff --git a/src/vector.rs b/src/vector.rs
index 4f111ac..108792a 100644
--- a/src/vector.rs
+++ b/src/vector.rs
@@ -102,6 +102,8 @@ macro_rules! impl_vector {
                 $VectorN { $($field: $field),+ }
             }
 
+            /// Perform the given operation on each field in the vector, returning a new point
+            /// constructed from the operations.
             #[inline]
             pub fn map<U, F>(self, mut f: F) -> $VectorN<U>
                 where F: FnMut(S) -> U