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-08-15 13:05:58 +0000
committerStijn Buys <ingar@osirion.org>2008-08-15 13:05:58 +0000
commit62de0496836e729ff955274cf153914709775bfb (patch)
tree54a868d8e4620b4dad49881af7a2614128697cbf /src/model/model.h
parent68fc01c7ce3f089e10a53e6dac92e2f63a9a8efd (diff)
func_group support
Diffstat (limited to 'src/model/model.h')
-rw-r--r--src/model/model.h29
1 files changed, 22 insertions, 7 deletions
diff --git a/src/model/model.h b/src/model/model.h
index 47728cb..35e8971 100644
--- a/src/model/model.h
+++ b/src/model/model.h
@@ -12,6 +12,7 @@
#include <map>
#include "math/mathlib.h"
+#include "model/dock.h"
#include "model/engine.h"
#include "model/fragment.h"
#include "model/light.h"
@@ -37,6 +38,9 @@ public:
/// type definition for a list of model flares
typedef std::list<Flare *> Flares;
+ /// type definition for a lost of dockable locations
+ typedef std::list<Dock *> Docks;
+
/// type definition for a list of model engines
typedef std::list<Engine *> Engines;
@@ -58,17 +62,23 @@ public:
return model_radius;
}
- /// list of fragments
- inline Fragments & fragments()
+ /// the worldspawn fragment group
+ inline FragmentGroup & worldspawn()
{
- return model_fragments;
+ return model_worldspawn;
}
-
+
/// list of lights
inline Lights & lights()
{
return model_lights;
}
+
+ /// list of dockable locations
+ inline Docks & docks()
+ {
+ return model_docks;
+ }
/// list of flares
inline Flares & flares()
@@ -111,6 +121,9 @@ public:
/// add a flare to the model
void add_flare(Flare *flare);
+
+ /// add a docking location to the model
+ void add_dock(Dock *dock);
float model_radius;
@@ -157,10 +170,12 @@ private:
static Registry model_registry;
std::string model_name;
-
- Fragments model_fragments;
- Flares model_flares;
+
+ FragmentGroup model_worldspawn;
+
+ Docks model_docks;
Engines model_engines;
+ Flares model_flares;
Lights model_lights;
};