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-10-24 22:22:34 +0000
committerStijn Buys <ingar@osirion.org>2010-10-24 22:22:34 +0000
commitfa852cfee26d3bdff0e18589ffb00851b0c25775 (patch)
tree45c2308424e77508fc79708932b5f163ec2992d9 /src/model/mapfile.h
parenta704318f507f486ac04834747eb209d0a9410702 (diff)
corrects model bounding box issues
Diffstat (limited to 'src/model/mapfile.h')
-rw-r--r--src/model/mapfile.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/model/mapfile.h b/src/model/mapfile.h
index be1e789..75db76e 100644
--- a/src/model/mapfile.h
+++ b/src/model/mapfile.h
@@ -128,9 +128,6 @@ private:
/// generate triangles for one plane in the plane list
void make_brushface(Face *face);
- /// load parsed primitives into model worldspawn
- void load_worldspawn(Model *model);
-
/// load parsed primitives into a FragmentGroup
void load_fragmentgroup(Model *model, const FragmentGroup::Type class_type);
@@ -167,12 +164,14 @@ private:
filesystem::IFileStream mapfile_ifs;
std::string mapfile_name;
- math::Vector3f class_maxbbox;
+ math::Vector3f map_minbbox;
+ math::Vector3f map_maxbbox;
+
math::Vector3f class_minbbox;
+ math::Vector3f class_maxbbox;
math::Axis class_axis;
float class_speed;
- math::Vector3f map_center;
Materials map_materials;
bool warning_q2brush;