[types] minor optimizations contains-point? & closest-point for Circl…

…e2 & Sphere
thi-ng · Mar 31, 2015 · 887415a · 887415a
1 parent d8b61f9
commit 887415a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/geom-types/src/circle.org b/geom-types/src/circle.org
@@ -85,7 +85,7 @@
   g/PBoundary
   (contains-point?
    [{p :p r :r} q]
-   (<= (g/mag-squared (g/- p q)) (* r r)))
+   (<= (g/dist-squared p q) (* r r)))
 #+END_SRC
 
 *** PCenter
@@ -203,7 +203,7 @@
   g/PProximity
   (closest-point
    [{p :p r :r} q]
-   (g/+ p (g/normalize (g/- q p) r)))
+   (g/+! (g/normalize (g/- q p) r) p))
 #+END_SRC
 
 *** PSample

diff --git a/geom-types/src/sphere.org b/geom-types/src/sphere.org
@@ -181,7 +181,7 @@ If there's no intersection, the function returns =nil=.
   g/PProximity
   (closest-point
    [{p :p r :r} q]
-   (g/+ p (g/normalize (g/- q p) r)))
+   (g/+! (g/normalize (g/- q p) r) p))
 #+END_SRC
 
 *** PSample