moved clear() from game::Game~ to core::GameServer~ (solves FIXME),

unified bounding box code into math::BoundingBox3f class 

1 files changed, 3 insertions, 10 deletions

diff --git a/src/model/model.h b/src/model/model.h
index 287b0cf..9495285 100644
--- a/src/model/model.h
+++ b/src/model/model.h
@@ -101,14 +101,8 @@ public:
 		return model_particles;
 	}
 
-	/// maximum values of the bounding box
-	inline const math::Vector3f & maxbbox() const {
-		return model_maxbbox;
-	}
-
-	/// minimum values of the bounding box
-	inline const math::Vector3f & minbbox() const {
-		return model_minbbox;
+	inline const math::BoundingBox3f & box() const {
+		return model_box;
 	}
 
 	/// engine sound loop for this model
@@ -156,8 +150,7 @@ public:
 	void set_origin(const math::Vector3f &origin);
 	
 	math::Vector3f		model_origin;
-	math::Vector3f		model_maxbbox;
-	math::Vector3f		model_minbbox;
+	math::BoundingBox3f	model_box;
 
 	unsigned int		model_enginesound;
 	unsigned int		model_impulsesound;