Changeset 8597

Timestamp:

May 26, 2011, 2:29:03 PM (13 years ago)

Author:

dafrick

Message:

Merging steering branch into presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• data/levels/includes/weaponSettingsAssff.oxi (modified) (1 diff)
• data/levels/templates/spaceshipAssff.oxt (modified) (1 diff)
• data/levels/templates/spaceshipAssff2.oxt (modified) (1 diff)
• src/orxonox/worldentities/MobileEntity.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/SpaceShip.cc (modified) (5 diffs)
• src/orxonox/worldentities/pawns/SpaceShip.h (modified) (1 diff)

code/branches/presentation/data/levels/includes/weaponSettingsAssff.oxi

@@ -30 +30 @@
         <Weapon>
           <attached>
-            <Model mesh="stunweapon.mesh" pitch="180" roll="0" yaw="0" position="1.9,-.5,1" scale=".5"/>
-            <BlinkingBillboard position="1.9, -.5, -5.5" material="PE/lensflare" colour="0.128, 0.28, 1" amplitude=0.25 frequency=16 quadratic=0 />
+            <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" />
+            <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" />
+            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 />
           </attached>
           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />

code/branches/presentation/data/levels/templates/spaceshipAssff.oxt

@@ -20 +20 @@
    primaryThrust     = 100
    auxilaryThrust    = 30
-   rotationThrust    = 25
+   rotationThrust    = 50
+
+   lift = 1;
+   stallSpeed = 220;
 
    boostPower            = 15

code/branches/presentation/data/levels/templates/spaceshipAssff2.oxt

@@ -18 +18 @@
    reloadwaittime      = 0.5
 
-   primaryThrust     = 100;
-   auxilaryThrust    = 30;
-   rotationThrust    = 25;
+   primaryThrust     = 100
+   auxilaryThrust    = 30
+   rotationThrust    = 50
+
+   lift = 1;
+   stallSpeed = 220;
 
    boostPower            = 10

code/branches/presentation/src/orxonox/worldentities/MobileEntity.cc

@@ -83 +83 @@
                 this->linearVelocity_.z += this->linearAcceleration_.z * dt;
                 this->node_->translate(this->linearVelocity_ * dt);
+
+    
 
                 // Angular part

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -36 +36 @@
 #include "core/XMLPort.h"
 #include "tools/Shader.h"
+#include "util/Debug.h" // TODO: Needed?
 #include "util/Math.h"
 
@@ -68 +69 @@
         this->boostCooldownDuration_ = 5.0;
         this->bBoostCooldown_ = false;
+
+        this->lift_ = 1.0f;                         // factor of the lift, standard is 1
+        this->stallSpeed_ = 220.0f;                 // max speed where lift is added
 
         this->bInvertYAxis_ = false;
@@ -116 +120 @@
                 XMLPortParamVariable(SpaceShip, "shakeFrequency", shakeFrequency_, xmlelement, mode);
         XMLPortParamVariable(SpaceShip, "shakeAmplitude", shakeAmplitude_, xmlelement, mode);
+                XMLPortParamVariable(SpaceShip, "lift", lift_, xmlelement, mode);
+        XMLPortParamVariable(SpaceShip, "stallSpeed", stallSpeed_, xmlelement, mode);
 
         XMLPortObject(SpaceShip, Engine, "engines", addEngine, getEngine, xmlelement, mode);
@@ -132 +138 @@
         registerVariable(this->shakeFrequency_, VariableDirection::ToClient);
         registerVariable(this->shakeAmplitude_, VariableDirection::ToClient);
+        registerVariable(this->lift_, VariableDirection::ToClient);
+        registerVariable(this->stallSpeed_, VariableDirection::ToClient);
     }
 
@@ -240 +248 @@
     void SpaceShip::rotatePitch(const Vector2& value)
     {
-        this->localAngularAcceleration_.setX(this->localAngularAcceleration_.x() + value.x);
+        this->localAngularAcceleration_.setX(this->localAngularAcceleration_.x() + value.x*0.8);
 
         Pawn::rotatePitch(value);
+
+                //This function call adds a lift to the ship when it is pitching to make it's movement more "realistic" and enhance the feeling.
+        if (abs(this-> getLocalVelocity().z) < stallSpeed_)  {this->moveUpDown(lift_ / 5 * value * sqrt(abs(this-> getLocalVelocity().z)));}
     }
 

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -98 +98 @@
             float boostPowerRate_;
             float boostCooldownDuration_;
+            float lift_;
+            float stallSpeed_;
             Vector3 steering_;
             float primaryThrust_;