Changeset 978 for code/trunk/src

Timestamp:

Apr 3, 2008, 2:23:53 PM (17 years ago)

Author:

FelixSchulthess

Message:

 

Location:

code/trunk/src/orxonox/objects

Files:

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

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -141 +141 @@
         this->tt_->getParticleSystem()->setParameter("local_space","true");
         this->tt_->newEmitter();
-        this->tt_->newEmitter();
-
 /*
         this->tt_->setDirection(Vector3(0,0,1));
@@ -149 +147 @@
 */
         this->tt_->setDirection(Vector3(-1,0,0));
-        this->tt_->setPositionOfEmitter(0, Vector3(-35,31,-3));
-        this->tt_->setPositionOfEmitter(1, Vector3(-35,-31,-3));
-        this->tt_->setPositionOfEmitter(2, Vector3(-48,0,20));
+        this->tt_->setPositionOfEmitter(0, Vector3(-15,20,-1));
+        this->tt_->setPositionOfEmitter(1, Vector3(-15,-20,-1));
         this->tt_->setVelocity(50);
 
@@ -165 +162 @@
         this->greenBillboard_.setBillboardSet("Examples/Flare", ColourValue(0.0, 1.0, 0.0), 1);
 
-        this->redNode_ = this->getNode()->createChildSceneNode(this->getName() + "red", Vector3(-0.9, 3.3, -0.4));
+        this->redNode_ = this->getNode()->createChildSceneNode(this->getName() + "red", Vector3(0.3, 4.7, -0.3));
         this->redNode_->setInheritScale(false);
-        this->greenNode_ = this->getNode()->createChildSceneNode(this->getName() + "green", Vector3(-0.9, -3.3, -0.4));
+        this->greenNode_ = this->getNode()->createChildSceneNode(this->getName() + "green", Vector3(0.3, -4.7, -0.3));
         this->greenNode_->setInheritScale(false);
 

code/trunk/src/orxonox/objects/SpaceShip.h

@@ -84 +84 @@
             float mouseY_;
 
-            float emitterRate_;
+            int emitterRate_;
     };
 }