diff options
author | Stijn Buys <ingar@osirion.org> | 2011-02-08 16:55:23 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2011-02-08 16:55:23 +0000 |
commit | 38eb51c26ab0d9dbebc974c7a21f96a429ce3098 (patch) | |
tree | 8563fdcf4de0d19ad20e660ae30b4b333825e4d4 /src/game/base/shipmodel.h | |
parent | 84dd93a63305bd3b1ff3c5c897a6f3e729bfefed (diff) |
Corrected triangle loading of collision model, added 'complex' flag to ships.ini
to enable collision models on player ships.
Diffstat (limited to 'src/game/base/shipmodel.h')
-rw-r--r-- | src/game/base/shipmodel.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/game/base/shipmodel.h b/src/game/base/shipmodel.h index f790bcd..a576c1d 100644 --- a/src/game/base/shipmodel.h +++ b/src/game/base/shipmodel.h @@ -80,6 +80,11 @@ public: return shipmodel_angular_damping; } + /// complex collision + inline const bool complex_collision() const { + return shipmodel_complex_collision; + } + /// maximum thrust speed inline const float maxspeed() const { return shipmodel_maxspeed; @@ -191,6 +196,13 @@ protected: shipmodel_angular_damping = angular_damping; } + /** + * @brief enable collision mesh + */ + inline void set_complex_collision(const float complex_collision) { + shipmodel_complex_collision = complex_collision; + } + public: void generate_info(); @@ -232,6 +244,8 @@ private: bool shipmodel_jumpdrive; bool shipmodel_dockable; + bool shipmodel_complex_collision; + const Template *shipmodel_template; /* --- static ----------------------------------------------------- */ |