X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FPlane.cc;h=5c4d9fd94b04d852cd96d449a7bf24c11b2c01b9;hp=975ef13c52194990ba54e712c0d3138fa56f5d03;hb=c78934a448d0126709fccec3d5a636b3baa87da4;hpb=72d4af22710317acffab861421c4364b1780b6fe

diff --git a/src/Moof/Plane.cc b/src/Moof/Plane.cc
index 975ef13..5c4d9fd 100644
--- a/src/Moof/Plane.cc
+++ b/src/Moof/Plane.cc
@@ -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.
+*
+**************************************************************************/
 
 #include "Aabb.hh"
 #include "Plane.hh"
@@ -34,7 +17,7 @@
 namespace Mf {
 
 
-Plane::Halfspace Plane::intersectsAabb(const Aabb& aabb) const
+Plane::Halfspace Plane::intersects(const Aabb<3>& aabb) const
 {
 	Vector3 corners[8];
 	int nPositive = 8;
@@ -43,7 +26,7 @@ Plane::Halfspace Plane::intersectsAabb(const Aabb& aabb) const
 
 	for (int i = 0; i < 8; ++i)
 	{
-		if (intersectsPoint(corners[i]) == NEGATIVE)
+		if (intersects(corners[i]) == NEGATIVE)
 		{
 			--nPositive;
 		}
@@ -54,7 +37,7 @@ Plane::Halfspace Plane::intersectsAabb(const Aabb& aabb) const
 	else                     return INTERSECT;
 }
 
-Plane::Halfspace Plane::intersectsSphere(const Sphere& sphere) const
+Plane::Halfspace Plane::intersects(const Sphere<3>& sphere) const
 {
 	Scalar distance = getDistanceToPoint(sphere.point);
 
@@ -66,5 +49,3 @@ Plane::Halfspace Plane::intersectsSphere(const Sphere& sphere) const
 
 } // namespace Mf
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-