From aedf317af126cebee4d39ece57730b203c04409c Mon Sep 17 00:00:00 2001
From: Brendan Zabarauskas <bjzaba@yahoo.com.au>
Date: Thu, 11 Jul 2013 11:45:21 +1000
Subject: [PATCH] Add rotate method to Point trait, remove from_vec function
 and move impl directly on types

---
 src/geom/plane.rs |  2 +-
 src/geom/point.rs | 35 +++++++++++++++++++++++------------
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/geom/plane.rs b/src/geom/plane.rs
index bdc2734..87c82b9 100644
--- a/src/geom/plane.rs
+++ b/src/geom/plane.rs
@@ -136,7 +136,7 @@ impl<T:Clone + Float> Plane3<T> {
                            self.norm.y.clone(), other_a.norm.y.clone(), other_b.norm.y.clone(),
                            self.norm.z.clone(), other_a.norm.z.clone(), other_b.norm.z.clone());
         do mx.inverse().map |m| {
-            Point::from_vec(
+            Point3::from_vec(
                 m.mul_v(&Vec3::new(self.dist.clone(),
                                    other_a.dist.clone(),
                                    other_b.dist.clone()))
diff --git a/src/geom/point.rs b/src/geom/point.rs
index 160281f..e9c68d5 100644
--- a/src/geom/point.rs
+++ b/src/geom/point.rs
@@ -15,15 +15,15 @@
 
 use std::cast;
 
-use core::{Vec2, Vec3};
+use core::{Vec2, Vec3, Quat};
 
 /// A geometric point
-pub trait Point<T,V>: Eq + ApproxEq<T> + ToStr {
-    pub fn from_vec(vec: V) -> Self;
-    pub fn as_vec<'a>(&'a self) -> &'a V;
-    pub fn as_mut_vec<'a>(&'a mut self) -> &'a mut V;
+pub trait Point<T,Vec,Rot>: Eq + ApproxEq<T> + ToStr {
+    pub fn as_vec<'a>(&'a self) -> &'a Vec;
+    pub fn as_mut_vec<'a>(&'a mut self) -> &'a mut Vec;
 
-    pub fn translate(&self, offset: &V) -> Self;
+    pub fn translate(&self, offset: &Vec) -> Self;
+    pub fn rotate(&self, rotation: &Rot) -> Self;
     pub fn distance(&self, other: &Self) -> T;
 }
 
@@ -36,14 +36,14 @@ impl<T> Point2<T> {
     pub fn new(x: T, y: T) -> Point2<T> {
         Point2 { x: x, y: y }
     }
-}
 
-impl<T:Clone + Float> Point<T,Vec2<T>> for Point2<T> {
     #[inline]
     pub fn from_vec(vec: Vec2<T>) -> Point2<T> {
         unsafe { cast::transmute(vec) }
     }
+}
 
+impl<T:Clone + Float> Point<T,Vec2<T>,T> for Point2<T> {
     #[inline]
     pub fn as_vec<'a>(&'a self) -> &'a Vec2<T> {
         unsafe { cast::transmute(self) }
@@ -56,7 +56,13 @@ impl<T:Clone + Float> Point<T,Vec2<T>> for Point2<T> {
 
     #[inline]
     pub fn translate(&self, offset: &Vec2<T>) -> Point2<T> {
-        Point::from_vec(self.as_vec().add_v(offset))
+        Point2::from_vec(self.as_vec().add_v(offset))
+    }
+
+    #[inline]
+    pub fn rotate(&self, radians: &T) -> Point2<T> {
+        Point2::new((*radians) * (*self).x.cos(),
+                    (*radians) * (*self).y.sin())
     }
 
     #[inline]
@@ -108,14 +114,14 @@ impl<T> Point3<T> {
     pub fn new(x: T, y: T, z: T) -> Point3<T> {
         Point3 { x: x, y: y, z: z }
     }
-}
 
-impl<T:Clone + Float> Point<T,Vec3<T>> for Point3<T> {
     #[inline]
     pub fn from_vec(vec: Vec3<T>) -> Point3<T> {
         unsafe { cast::transmute(vec) }
     }
+}
 
+impl<T:Clone + Float> Point<T,Vec3<T>,Quat<T>> for Point3<T> {
     #[inline]
     pub fn as_vec<'a>(&'a self) -> &'a Vec3<T> {
         unsafe { cast::transmute(self) }
@@ -128,7 +134,12 @@ impl<T:Clone + Float> Point<T,Vec3<T>> for Point3<T> {
 
     #[inline]
     pub fn translate(&self, offset: &Vec3<T>) -> Point3<T> {
-        Point::from_vec(self.as_vec().add_v(offset))
+        Point3::from_vec(self.as_vec().add_v(offset))
+    }
+
+    #[inline]
+    pub fn rotate(&self, rotation: &Quat<T>) -> Point3<T> {
+        Point3::from_vec(rotation.mul_v(self.as_vec()))
     }
 
     #[inline]