Merge 865b8d4 into 447720b

SpockBotMC · Sep 6, 2015 · bac9a54 · bac9a54
2 parents 447720b + 865b8d4
commit bac9a54
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/spock/vector.py b/spock/vector.py
@@ -89,9 +89,6 @@ def trunc(self):
     def __trunc__(self):
         return self.__class__(*map(math.trunc, self))
 
-    def norm(self):
-        return math.sqrt(sum(map(lambda a: a * a, self)))
-
     # Utilities
 
     def ifloor(self):
@@ -114,6 +111,12 @@ def dist_sq(self, other=None):
         v = self - other if other else self
         return sum(map(lambda a: a * a, v))
 
+    def dist(self, other=None):
+        return math.sqrt(self.dist_sq(other))
+
+    def norm(self):
+        return self / self.dist()
+
     # Truthy evaluation
     def __bool__(self):
         return any(self)