X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSphere.hh;h=d42bfd8a98fa8e643494c7b242f8e659c1893da9;hp=f1847091c6d0afcc9bad1cbbabcddfdb7cb78dfe;hb=76b3f4be992514a740ac03cdbdd57844142a0b4c;hpb=7f3984f3f9524f5b6813e01ceb2fe576dadff94e

diff --git a/src/Moof/Sphere.hh b/src/Moof/Sphere.hh
index f184709..d42bfd8 100644
--- a/src/Moof/Sphere.hh
+++ b/src/Moof/Sphere.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_SPHERE_HH_
 #define _MOOF_SPHERE_HH_
@@ -36,6 +19,7 @@
 #include <Moof/OpenGL.hh>
 #include <Moof/Shape.hh>
 
+// TODO this needs work
 
 namespace Mf {
 
@@ -77,7 +61,7 @@ struct Sphere : public Cullable, public Drawable, public Shape<D>
 
 
 	// a ray inside the sphere will not intersect on its way out
-	bool intersectRay(const Ray<D>& ray, typename Ray<D>::Intersection& hit)
+	bool intersectRay(const Ray<D>& ray, typename Ray<D>::Contact& hit)
 	{
 		Vector b = point - ray.point;
 		Scalar z = cml::dot(b, ray.direction);
@@ -106,30 +90,30 @@ struct Sphere : public Cullable, public Drawable, public Shape<D>
 	//void draw(Scalar alpha = 0.0) const;
 	//bool isVisible(const Frustum& frustum) const;
 
-void encloseVertices(const Vector vertices[], unsigned count)
-{
-	// TODO
-}
+	void encloseVertices(const Vector vertices[], unsigned count)
+	{
+		// TODO
+	}
 
-void draw(Scalar alpha = 0.0) const;
-//{
-	//GLUquadricObj* sphereObj = gluNewQuadric();
-	//gluQuadricDrawStyle(sphereObj, GLU_LINE);
+	void draw(Scalar alpha = 0.0) const;
+	//{
+		//GLUquadricObj* sphereObj = gluNewQuadric();
+		//gluQuadricDrawStyle(sphereObj, GLU_LINE);
 
-	//glPushMatrix();
+		//glPushMatrix();
 
-	//glTranslate(point);
-	//gluSphere(sphereObj, GLdouble(radius), 16, 16);
+		//glTranslate(point);
+		//gluSphere(sphereObj, GLdouble(radius), 16, 16);
 
-	//glPopMatrix();
+		//glPopMatrix();
 
-	//gluDeleteQuadric(sphereObj);
-//}
+		//gluDeleteQuadric(sphereObj);
+	//}
 
-bool isVisible(const Frustum& frustum) const
-{
-	return true;
-}
+	bool isVisible(const Frustum& frustum) const
+	{
+		return true;
+	}
 };
 
 
@@ -179,9 +163,12 @@ inline bool checkCollision(const Sphere<D>& a, const Sphere<D>& b)
 }
 
 
+typedef Sphere<2>	Sphere2;
+typedef Sphere2 	Circle;
+typedef Sphere<3>	Sphere3;
+
+
 } // namespace Mf
 
 #endif // _MOOF_SPHERE_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-