From b7dc0938eb7d59f928bbcf2a3a4877a6f60940e5 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Mon, 8 Nov 2010 14:34:44 +0000 Subject: moved clear() from game::Game~ to core::GameServer~ (solves FIXME), unified bounding box code into math::BoundingBox3f class --- src/model/mapfile.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/model/mapfile.h') diff --git a/src/model/mapfile.h b/src/model/mapfile.h index fbb594c..4cea7f0 100644 --- a/src/model/mapfile.h +++ b/src/model/mapfile.h @@ -121,6 +121,10 @@ private: inline std::string const & name() const { return mapfile_name; } + + inline const math::BoundingBox3f & box() const { + return map_box; + } /// close the file void close(); @@ -164,11 +168,9 @@ private: filesystem::IFileStream mapfile_ifs; std::string mapfile_name; - math::Vector3f map_minbbox; - math::Vector3f map_maxbbox; + math::BoundingBox3f map_box; - math::Vector3f class_minbbox; - math::Vector3f class_maxbbox; + math::BoundingBox3f class_box; math::Axis class_axis; float class_speed; bool class_engine; -- cgit v1.2.3