X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FEntity.hh;h=ee0f8602c6fd8585090251b9d89cab8f753aefd6;hp=310e0a128cbb52c0371ec742390d3d46144fcaeb;hb=3f6e44698c38b74bb622ad81ea9d2daa636981d2;hpb=25aefe01ef7dbdb603c51411e04b0d6a6107684f

diff --git a/src/Moof/Entity.hh b/src/Moof/Entity.hh
index 310e0a1..ee0f860 100644
--- a/src/Moof/Entity.hh
+++ b/src/Moof/Entity.hh
@@ -48,32 +48,39 @@ 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 Cullable, public Drawable
 {
+protected:
+
+	Aabb<3>		mAabb;
+	Sphere<3>	mSphere;
+
 public:
+
 	virtual ~Entity() {}
 
-	const Aabb& getAabb() const
+	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);
 	}
 
-	void drawIfVisible(Scalar alpha, const Frustum& frustum) const
+	const Aabb<3>& getAabb() const
 	{
-		if (isVisible(frustum)) draw(alpha);
+		return mAabb;
 	}
 
-protected:
-	Aabb	aabb_;
-	Sphere	sphere_;
+	const Sphere<3>& getSphere() const
+	{
+		return mSphere;
+	}
 };