Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-11-08 14:34:44 +0000
committerStijn Buys <ingar@osirion.org>2010-11-08 14:34:44 +0000
commitb7dc0938eb7d59f928bbcf2a3a4877a6f60940e5 (patch)
tree5b4b4353f2012fced4180072e0b0def8ba8d22db /src/model/asefile.h
parentb685a594ae43aa30173912c9fb1177d507ec5a08 (diff)
moved clear() from game::Game~ to core::GameServer~ (solves FIXME),
unified bounding box code into math::BoundingBox3f class
Diffstat (limited to 'src/model/asefile.h')
-rw-r--r--src/model/asefile.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/model/asefile.h b/src/model/asefile.h
index 9e3fea6..c16bf5c 100644
--- a/src/model/asefile.h
+++ b/src/model/asefile.h
@@ -141,6 +141,10 @@ private:
inline FragmentGroup *fragmentgroup() {
return ase_fragmentgroup;
}
+
+ inline const math::BoundingBox3f & box() const {
+ return ase_box;
+ }
std::string asefile_name;
@@ -154,9 +158,7 @@ private:
MaterialList ase_materials;
- math::Vector3f ase_maxbbox;
-
- math::Vector3f ase_minbbox;
+ math::BoundingBox3f ase_box;
FragmentGroup *ase_fragmentgroup;