X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fentity.hh;h=92b4dc5dd7b074b747020d3a7fc807c7da49ebc5;hp=f95a94cc1fba513549ac4e56fd6ec0e8fa17dbb0;hb=574af38ed616d1adfa5e6ce35f67cda1f707f89d;hpb=6c9943707d4f33035830eba0587a61a34eaecbc2

diff --git a/src/moof/entity.hh b/src/moof/entity.hh
index f95a94c..92b4dc5 100644
--- a/src/moof/entity.hh
+++ b/src/moof/entity.hh
@@ -1,13 +1,11 @@
 
-/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+/*]  Copyright (c) 2009-2011, 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_
@@ -28,17 +26,9 @@
 namespace moof {
 
 
+// forward declarations
 class frustum;
 
-
-class entity;
-
-/**
- * Entity pointer.
- */
-typedef boost::shared_ptr<entity> entity_ptr;
-
-
 /**
  * Interface for game objects that can be drawn to the screen and have a
  * specified volume (take up space).
@@ -57,7 +47,8 @@ public:
 	 * timestep.
 	 * \param frustum The camera frustum for determining visibility.
 	 */
-	virtual void draw_if_visible(scalar alpha, const frustum& frustum) const
+	virtual void
+	draw_if_visible(scalar alpha, const frustum& frustum) const
 	{
 		if (is_visible(frustum)) draw(alpha);
 	}
@@ -74,7 +65,6 @@ public:
 		return sphere_.is_visible(frustum) && aabb_.is_visible(frustum);
 	}
 
-
 	/**
 	 * Get the axis-aligned bounding box surrounding the entity.
 	 * \return The AABB.
@@ -92,13 +82,14 @@ public:
 		return sphere_;
 	}
 
-
 protected:
 
-	moof::aabb3		aabb_;
+	moof::aabb3	aabb_;
 	moof::sphere3	sphere_;
 };
 
+typedef boost::shared_ptr<entity> entity_ptr;
+
 
 } // namespace moof