Changeset 626

Timestamp:

Dec 18, 2007, 8:58:22 PM (16 years ago)

Author:

rgrieder

Message:

• thruster effects are now only shown when the ship accelerates

Location:

code/branches/FICN/src/orxonox/objects

Files:

• SpaceShip.cc (modified) (4 diffs)
• SpaceShip.h (modified) (1 diff)

code/branches/FICN/src/orxonox/objects/SpaceShip.cc

@@ -121 +121 @@
         w->setPositionOfEmitter(1, Vector3(0,-10,10));
 
+        emitterRate_ = w->getRate();
+
         Ogre::SceneNode* node1 = this->getNode()->createChildSceneNode(this->getName() + "particle1");
         node1->setInheritScale(false);
@@ -138 +140 @@
         tt->setPositionOfEmitter(0, Vector3(-15,20,-1));
         tt->setPositionOfEmitter(1, Vector3(-15,-20,-1));
+        tt->setVelocity(50);
 
         Ogre::SceneNode* node2 = this->getNode()->createChildSceneNode(this->getName() + "particle2");
@@ -271 +274 @@
         if(moveForward_ <= 0)
         {
-            accelerationForward_ = brakeForward_;
+            accelerationForward_ = -brakeForward_;
             if(speedForward_ > 0)
-                speedForward_ -= accelerationForward_*dt;
+                speedForward_ += accelerationForward_*dt;
             if(speedForward_ < 0)
                 speedForward_ = 0;
@@ -380 +383 @@
         this->pitch(Degree(speedLoopRightLeft_*dt), Ogre::Node::TS_LOCAL);
 
+        if (accelerationForward_ > 25.0)
+        {
+          this->tt->setRate(emitterRate_);
+        }
+        else
+        {
+          this->tt->setRate(0);
+        }
+
     }
 

code/branches/FICN/src/orxonox/objects/SpaceShip.h

@@ -78 +78 @@
             float minMouseX;
             bool moved;
+
+            int emitterRate_;
     };
 }