reformatting

[chaz/yoink] / src / Moof / Plane.hh

diff --git a/src/Moof/Plane.hh b/src/Moof/Plane.hh
index 5ec59eab28e1c6115f4923b92892de9fd5e9d572..262a6bd281bfb796eb1832b3f2e68c54761e0dd4 100644 (file)
--- a/src/Moof/Plane.hh
+++ b/src/Moof/Plane.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_PLANE_HH_
 #define _MOOF_PLANE_HH_
@@ -41,8 +24,8 @@ template <int D> class Sphere;
 
 
 /*
- * A plane in 3-space defined by the equation Ax + By + Cz = D, where [A, B, C]
- * is normal to the plane.
+ * A plane in 3-space defined by the equation Ax + By + Cz = D, where [A,
+ * B, C] is normal to the plane.
  */
 
 struct Plane : public Shape<3>
@@ -66,41 +49,41 @@ struct Plane : public Shape<3>
                d(scalar) {}
 
 
-       Scalar intersectRay(const Ray<3>& ray, Ray<3>::Intersection& intersection)
+       bool intersectRay(const Ray<3>& ray, Ray<3>::Intersection& hit)
        {
                // solve: [(ray.point + t*ray.direction) dot normal] + d = 0
 
-               Scalar denominator = cml::dot(ray.direction, normal);
+               Scalar denom = cml::dot(ray.direction, normal);
 
                // check for parallel condition
-               if (denominator == SCALAR(0.0))
+               if (denom == SCALAR(0.0))
                {
                        if (isEqual(cml::dot(ray.point, normal), -d))
                        {
                                // the ray lies on the plane
-                               intersection.point = ray.point;
-                               intersection.normal = normal;
-                               return SCALAR(0.0);
+                               hit.distance = SCALAR(0.0);
+                               hit.normal.set(0.0, 0.0, 0.0);
+                               return true;
                        }
 
                        // no solution
-                       return SCALAR(-1.0);
+                       return false;
                }
 
-               Scalar t = (cml::dot(ray.point, normal) + d) / denominator;
-               if (t > SCALAR(0.0))
-               {
-                       ray.solve(intersection.point, t);
-                       intersection.normal = normal;
-               }
+               Scalar numer = cml::dot(ray.point, normal) + d;
+               hit.distance = -numer / denom;
+               if (hit.distance < SCALAR(0.0)) return false;
 
-               return t;
+               if (numer >= 0.0) hit.normal = normal;
+               else              hit.normal = -normal;
+               return true;
        }
 
 
-       /* Causes the normal of the plane to become normalized.  The scalar may also
-        * be changed to keep the equation true.  Word to the wise: don't normalize
-        * a plane if the normal is the zero vector. */
+       /* Causes the normal of the plane to become normalized.  The scalar may
+        * also be changed to keep the equation true.  Word to the wise: don't
+        * normalize a plane if the normal is the zero vector.
+        */
        void normalize()
        {
                Scalar mag = normal.length();
@@ -110,8 +93,8 @@ struct Plane : public Shape<3>
        }
 
        /**
-        * Determine the shortest distance between a point and the plane. */
-
+        * Determine the shortest distance between a point and the plane.
+        */
        Scalar getDistanceToPoint(const Vector3& point) const
        {
                return cml::dot(point, normal) + d;
@@ -135,5 +118,3 @@ struct Plane : public Shape<3>
 
 #endif // _MOOF_PLANE_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-