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-24 20:13:56 +0000
committerStijn Buys <ingar@osirion.org>2010-11-24 20:13:56 +0000
commit9623feb8667b9aa5a47343a13d5b9acb2312cbf8 (patch)
tree1c8062e3086d661a737008b73f9e83eb1324f8b4 /src/game/base/shipmodel.h
parent808b21fc5fc33cf426fe459c7334d8101baafa0a (diff)
Exposed ship physics damping factors through ships.ini and the specs command.
Diffstat (limited to 'src/game/base/shipmodel.h')
-rw-r--r--src/game/base/shipmodel.h29
1 files changed, 28 insertions, 1 deletions
diff --git a/src/game/base/shipmodel.h b/src/game/base/shipmodel.h
index bbb5798..f790bcd 100644
--- a/src/game/base/shipmodel.h
+++ b/src/game/base/shipmodel.h
@@ -70,6 +70,16 @@ public:
return shipmodel_roll_force;
}
+ /// linear damping factor
+ inline const float linear_damping() const {
+ return shipmodel_linear_damping;
+ }
+
+ /// angular damping factor
+ inline const float angular_damping() const {
+ return shipmodel_angular_damping;
+ }
+
/// maximum thrust speed
inline const float maxspeed() const {
return shipmodel_maxspeed;
@@ -127,7 +137,7 @@ protected:
shipmodel_strafe_force = strafe;
}
- /// set turn force
+ /// set turn forceshipmodel_lineardamping
inline void set_turn_force(const float turn) {
shipmodel_turn_force = turn;
}
@@ -167,6 +177,20 @@ protected:
shipmodel_template = model_template;
}
+ /**
+ * @brief set physics linear damping factor
+ */
+ inline void set_linear_damping(const float linear_damping) {
+ shipmodel_linear_damping = linear_damping;
+ }
+
+ /**
+ * @brief set physics linear damping factor
+ */
+ inline void set_angular_damping(const float angular_damping) {
+ shipmodel_angular_damping = angular_damping;
+ }
+
public:
void generate_info();
@@ -193,6 +217,9 @@ private:
float shipmodel_radius;
float shipmodel_mass;
+ float shipmodel_linear_damping;
+ float shipmodel_angular_damping;
+
float shipmodel_impulse_force;
float shipmodel_thrust_force;
float shipmodel_strafe_force;