Changeset 10836 for code/branches/particleEffectsHS15/src

Timestamp:

Nov 23, 2015, 3:44:31 PM (9 years ago)

Author:

holzerj

Message:

Added Mine, ice particle, rocketfire, psygun

Location:

code/branches/particleEffectsHS15/src/modules/weapons

Files:

• munitions/CMakeLists.txt (modified) (1 diff)
• munitions/MineMunition.cc (added)
• munitions/MineMunition.h (added)
• projectiles/CMakeLists.txt (modified) (1 diff)
• projectiles/IceGunProjectile.cc (modified) (2 diffs)
• projectiles/IceGunProjectile.h (modified) (2 diffs)
• projectiles/MineProjectile.cc (added)
• projectiles/MineProjectile.h (added)
• weaponmodes/CMakeLists.txt (modified) (1 diff)
• weaponmodes/MineGun.cc (added)
• weaponmodes/MineGun.h (added)

code/branches/particleEffectsHS15/src/modules/weapons/munitions/CMakeLists.txt

@@ -7 +7 @@
   IceMunition.cc
   SplitMunition.cc
+  MineMunition.cc
 )

code/branches/particleEffectsHS15/src/modules/weapons/projectiles/CMakeLists.txt

@@ -12 +12 @@
   GravityBomb.cc
   GravityBombField.cc
+  MineProjectile.cc
 )

code/branches/particleEffectsHS15/src/modules/weapons/projectiles/IceGunProjectile.cc

@@ -34 +34 @@
 #include "IceGunProjectile.h"
 
+#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+
 #include "core/CoreIncludes.h"
 #include "graphics/Model.h"
+#include "graphics/ParticleSpawner.h"
+#include "Scene.h"
+#include "core/command/Executor.h"
+#include "tools/ParticleInterface.h"
 
 namespace orxonox
@@ -55 +62 @@
         this->attach(model);
         model->setPosition(Vector3(0,0,0));
+
+        // Add effect.
+        emitter_ = new ParticleEmitter(this->getContext());
+        this->attach(emitter_);
+        emitter_->setOrientation(this->getOrientation());
+        emitter_->setSource("Orxonox/ice");        
+    }
+
+    IceGunProjectile::~IceGunProjectile()
+    {
+        if (this->isInitialized())
+        {
+            const Vector3& pos = emitter_->getWorldPosition();
+            const Quaternion& rot = emitter_->getWorldOrientation();
+            this->detach(emitter_);
+            emitter_->setPosition(pos);
+            emitter_->setOrientation(rot);
+            emitter_->getParticleInterface()->setEnabled(false);
+            this->getScene()->getRootSceneNode()->addChild(const_cast<Ogre::SceneNode*>(emitter_->getNode()));
+
+            const ExecutorPtr& executor = createExecutor(createFunctor(&ParticleEmitter::destroy, emitter_));
+            new Timer(15, false, executor, true);
+        }
     }
 

code/branches/particleEffectsHS15/src/modules/weapons/projectiles/IceGunProjectile.h

@@ -56 +56 @@
         public:
             IceGunProjectile(Context* context);
-            virtual ~IceGunProjectile() {}
+            virtual ~IceGunProjectile();
 
             virtual void setFreezeTime(float freezeTime);
@@ -63 +63 @@
         protected:
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
-        private:         
+        private:
+            ParticleEmitter* emitter_;
             float freezeTime_; //The duration of the freezing effect on a target
             float freezeFactor_; //The strength of the freezing effect

code/branches/particleEffectsHS15/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -11 +11 @@
   SimpleRocketFire.cc
   GravityBombFire.cc
+  MineGun.cc
 )