X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FSphere.hh;h=f5285545b17a3faa66ba3f4fdd0a250b1bf50a99;hp=f7b6a95fe7a6d89a450291491ad8c1db012fada2;hb=00612586426be6d9a976f141a25ffc1f0d284501;hpb=2d77fb5fb3480f522658f30af6addd5146530517 diff --git a/src/Moof/Sphere.hh b/src/Moof/Sphere.hh index f7b6a95..f528554 100644 --- a/src/Moof/Sphere.hh +++ b/src/Moof/Sphere.hh @@ -1,34 +1,18 @@ -/******************************************************************************* - - 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_ +#include #include #include #include @@ -36,6 +20,7 @@ #include #include +// TODO this needs work namespace Mf { @@ -44,24 +29,22 @@ namespace Mf { * A round object. */ + template struct Sphere : public Cullable, public Drawable, public Shape { typedef cml::vector< Scalar, cml::fixed > Vector; - // (solution - point)^2 - radius^2 = 0 Vector point; Scalar radius; + Sphere() {} Sphere(const Vector& p, Scalar r) : point(p), radius(r) {} - //Sphere(Scalar x, Scalar y, Scalar z, Scalar r) : - //point(x, y, z), - //radius(r) {} void init(const Vector& p, Scalar r) { @@ -75,60 +58,76 @@ struct Sphere : public Cullable, public Drawable, public Shape radius = (o - p).length(); } + //void encloseVertices(const Vector vertices[], unsigned count); - // a ray inside the sphere will not intersect on its way out - Scalar intersectRay(const Ray& ray, - typename Ray::Intersection& intersection) + //void draw(Scalar alpha = 0.0) const; + //bool isVisible(const Frustum& frustum) const; + + void encloseVertices(const Vector vertices[], unsigned count) { - Vector b = point - ray.point; - Scalar z = cml::dot(b, ray.direction); + // TODO + } - // check if the ball is behind the ray - if (z < SCALAR(0.0)) return SCALAR(-1.0); + void draw(Scalar alpha = 0.0) const; - Scalar d2 = cml::dot(b, b) - z*z; - Scalar r2 = radius * radius; + bool isVisible(const Frustum& frustum) const + { + return true; + } - // check for an intersection - if (d2 > r2) return SCALAR(-1.0); - Scalar t = z - std::sqrt(r2 - d2); - ray.solve(intersection.point, t); - intersection.normal = intersection.point - point; + bool intersect(const Sphere& sphere, Contact& hit) const + { + Vector n = sphere.point - point; + Scalar distance = n.length(); + Scalar limit = radius + sphere.radius; + + if (distance > limit) return false; - return t; + hit.normal = n.normalize(); + hit.distance = limit - distance; + hit.point = hit.normal * radius; + + return true; } + bool intersect(const Vector& point2, Contact& hit) const + { + Vector n = point2 - point; + Scalar distance = n.length(); - //void encloseVertices(const Vector vertices[], unsigned count); + if (distance > radius) return false; - //void draw(Scalar alpha = 0.0) const; - //bool isVisible(const Frustum& frustum) const; + hit.normal = n.normalize(); + hit.distance = radius - distance; + hit.point = point2; -void encloseVertices(const Vector vertices[], unsigned count) -{ - // TODO -} + return true; + } -void draw(Scalar alpha = 0.0) const; -//{ - //GLUquadricObj* sphereObj = gluNewQuadric(); - //gluQuadricDrawStyle(sphereObj, GLU_LINE); + // a ray inside the sphere will not intersect on its way out + bool intersect(const Ray& ray, typename Ray::Contact& hit) const + { + Vector b = point - ray.point; + Scalar z = cml::dot(b, ray.direction); - //glPushMatrix(); + // check if the ball is behind the ray + if (z < SCALAR(0.0)) return false; - //glTranslate(point); - //gluSphere(sphereObj, GLdouble(radius), 16, 16); + Scalar d2 = cml::dot(b, b) - z*z; + Scalar r2 = radius * radius; - //glPopMatrix(); + // check for an intersection + if (d2 > r2) return false; - //gluDeleteQuadric(sphereObj); -//} + hit.distance = z - std::sqrt(r2 - d2); + if (hit.distance < SCALAR(0.0)) return false; -bool isVisible(const Frustum& frustum) const -{ - return true; -} + Vector surfacePoint; + ray.solve(surfacePoint, hit.distance); + hit.normal = surfacePoint - point; + return true; + } }; @@ -178,9 +177,12 @@ inline bool checkCollision(const Sphere& a, const Sphere& 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: *************************************************/ -