removed logging from script to fix compile error

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

diff --git a/src/Moof/Entity.hh b/src/Moof/Entity.hh
index 33efcc9e77ca20afbc362184007306e0ca586c7f..4e71466579693ff455d156dde95f836f03e7d112 100644 (file)
--- a/src/Moof/Entity.hh
+++ b/src/Moof/Entity.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_ENTITY_HH_
 #define _MOOF_ENTITY_HH_
@@ -40,40 +23,48 @@
 namespace Mf {
 
 
-class Entity;
-typedef boost::shared_ptr<Entity> EntityP;
-
-class Camera;
+class Frustum;
 
 
 /**
  * Interface for game objects that can be drawn to the screen and have a
- * specified size.
+ * specified volume (take up space).
  */
 
-class Entity : public Drawable, public Cullable
+class Entity;
+typedef boost::shared_ptr<Entity> EntityP;
+
+
+class Entity : public Cullable, public Drawable
 {
+protected:
+
+       Aabb<3>         mAabb;
+       Sphere<3>       mSphere;
+
 public:
-       inline virtual ~Entity() {}
 
-       const Aabb& getAabb() const
+       virtual ~Entity() {}
+
+       virtual void drawIfVisible(Scalar alpha, const Frustum& frustum) const
        {
-               return aabb_;
+               if (isVisible(frustum)) draw(alpha);
        }
 
-       const Sphere& getSphere() const
+       virtual bool isVisible(const Frustum& frustum) const
        {
-               return sphere_;
+               return mSphere.isVisible(frustum) && mAabb.isVisible(frustum);
        }
 
-       virtual void drawIfVisible(Scalar alpha, const Camera& cam) const
+       const Aabb<3>& getAabb() const
        {
-               if (isVisible(cam)) draw(alpha);
+               return mAabb;
        }
 
-protected:
-       Aabb    aabb_;
-       Sphere  sphere_;
+       const Sphere<3>& getSphere() const
+       {
+               return mSphere;
+       }
 };
 
 
@@ -81,5 +72,3 @@ protected:
 
 #endif // _MOOF_ENTITY_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-