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>2008-12-21 12:12:53 +0000
committerStijn Buys <ingar@osirion.org>2008-12-21 12:12:53 +0000
commitaad0913d91fc3b682deddb5a5f8380d1475174f5 (patch)
tree5b1489a36e7640805058d99db0a0c44447949f4a /src/model/map.h
parentda4b99de2cf290ccdd22587a8c50aeeadd5ac957 (diff)
improved func_rotate
Diffstat (limited to 'src/model/map.h')
-rw-r--r--src/model/map.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/model/map.h b/src/model/map.h
index 9b75f7a..f9b036f 100644
--- a/src/model/map.h
+++ b/src/model/map.h
@@ -64,6 +64,11 @@ private:
/// true if the last read line contained a new classname
bool got_classname() const;
+ /// true if we are inside the requested class
+ bool in_class(const char *name) {
+ return (classname_current.compare(name) == 0);
+ }
+
/// true if the last read line contained a class closing bracket
inline bool got_classend() const
{
@@ -130,7 +135,7 @@ private:
void load_worldspawn(Model *model);
/// load parsed primitives into a FragmentGroup
- void load_fragmentgroup(Model *model, const FragmentGroup::Type type);
+ void load_fragmentgroup(Model *model, const FragmentGroup::Type class_type);
/// clear the current list of per-material geometry
void clear_materials();
@@ -160,9 +165,10 @@ private:
math::Vector3f class_maxbbox;
math::Vector3f class_minbbox;
+ float class_angle;
+ float class_speed;
math::Vector3f map_center;
-
Materials map_materials;
};