Changeset 2493 for code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc

Timestamp:

Dec 17, 2008, 2:10:11 AM (15 years ago)

Author:

landauf

Message:

merged weapon2 branch to presentation

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified) (5 diffs)

code/branches/presentation/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc

@@ -30 +30 @@
 #include "ParticleProjectile.h"
 
-#include "SpaceShip.h"
+#include <OgreParticleSystem.h>
+#include <OgreParticleEmitter.h>
+
+#include "../../worldentities/pawns/SpaceShip.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
+#include "objects/Scene.h"
 
 namespace orxonox
@@ -38 +42 @@
     CreateFactory(ParticleProjectile);
 
-    ParticleProjectile::ParticleProjectile(BaseObject* creator, Weapon* owner) : BillboardProjectile(creator, owner)
+    ParticleProjectile::ParticleProjectile(BaseObject* creator) : BillboardProjectile(creator)
     {
         RegisterObject(ParticleProjectile);
 
-        this->particles_ = new ParticleInterface("Orxonox/shot2", LODParticle::normal);
-        this->particles_->addToSceneNode(this->getNode());
-        this->particles_->setKeepParticlesInLocalSpace(true);
+        this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/shot3_small", LODParticle::normal);
+        this->attachOgreObject(this->particles_->getParticleSystem());
+        this->particles_->setKeepParticlesInLocalSpace(0);
+
+        this->particles_->getAllEmitters()->setDirection(-WorldEntity::FRONT);
+        /*
         if (this->owner_)
         {
@@ -52 +59 @@
 //            this->particles_ = 0;
 //        }
+        */
 
         this->setConfigValues();
@@ -59 +67 @@
     {
         if (this->isInitialized() && this->particles_)
+        {
+            this->detachOgreObject(this->particles_->getParticleSystem());
             delete this->particles_;
+        }
     }
 
     void ParticleProjectile::setConfigValues()
     {
-        SetConfigValue(speed_, 5000.0).description("The speed of a projectile in units per second").callback((Projectile*)this, &ParticleProjectile::speedChanged);
+        //SetConfigValue(speed_, 5000.0).description("The speed of a projectile in units per second").callback((Projectile*)this, &ParticleProjectile::speedChanged);
     }
 
@@ -72 +83 @@
         this->particles_->setEnabled(this->isVisible());
     }
-
-    bool ParticleProjectile::create(){
-      if(!Projectile::create())
-        return false;
-      this->particles_->getAllEmitters()->setDirection(-this->getOrientation()*Vector3(1,0,0));
-      return true;
-    }
 }