Changeset 6098

Timestamp:

Nov 18, 2009, 5:19:28 PM (15 years ago)

Author:

cdaniel

Message:

Fixed Rocket.cc (starts now in correct direction when played with windows) and added/changed some particle effects

File:

• code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc (modified) (5 diffs)

code/branches/particles2/src/modules/weapons/projectiles/Rocket.cc

@@ -51 +51 @@
     {
         RegisterObject(Rocket);// - register the Rocket class to the core
+
+                this->localAngularVelocity_ = 0;
         
         if (GameMode::isMaster())
@@ -60 +62 @@
         
             this->model_ = new Model(this);
-            this->model_->setMeshSource("rocket_test.mesh");
-            this->attach(this->model_);
+            this->model_->setMeshSource("rocket.mesh");
+                        this->attach(this->model_);
+                        ParticleSpawner* fire = new ParticleSpawner(this);
+                        this->attach(fire);
+                        fire->setOrientation(this->getOrientation());
+            fire->setSource("Orxonox/rocketfire");
         
             this->enableCollisionCallback();
@@ -73 +79 @@
 
             this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&Rocket::destroyObject, this)));
+               
+                        
         }
         
@@ -156 +164 @@
                     effect->setOrientation(this->getOrientation());
                     effect->setDestroyAfterLife(true);
-                    effect->setSource("Orxonox/explosion3");
+                    effect->setSource("Orxonox/explosion4");
                     effect->setLifetime(2.0f);
                 }
+
                 {
                     ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
@@ -196 +205 @@
                 effect->setOrientation(this->getOrientation());
                 effect->setDestroyAfterLife(true);
-                effect->setSource("Orxonox/explosion3");
+                effect->setSource("Orxonox/explosion4");
                 effect->setLifetime(2.0f);
             }
+
             {
                 ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());