diff options
| author | Stijn Buys <ingar@osirion.org> | 2010-11-08 14:34:44 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2010-11-08 14:34:44 +0000 |
| commit | b7dc0938eb7d59f928bbcf2a3a4877a6f60940e5 (patch) | |
| tree | 5b4b4353f2012fced4180072e0b0def8ba8d22db /src/model/mapfile.h | |
| parent | b685a594ae43aa30173912c9fb1177d507ec5a08 (diff) | |
moved clear() from game::Game~ to core::GameServer~ (solves FIXME),
unified bounding box code into math::BoundingBox3f class
Diffstat (limited to 'src/model/mapfile.h')
| -rw-r--r-- | src/model/mapfile.h | 10 |
1 files changed, 6 insertions, 4 deletions
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; |