Changeset 10963 for code/branches/presentationHS15/src/modules/weapons/projectiles

Timestamp:

Dec 9, 2015, 4:56:39 PM (9 years ago)

Author:

maxima

Message:

Merged presentation and particleEffects branches. Added a new level, spaceshiptemplate and weaponsettings for the mine.

Location:

code/branches/presentationHS15

Files:

• . (modified) (1 prop)
• src/modules/weapons/projectiles/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/IceGunProjectile.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/IceGunProjectile.h (modified) (2 diffs)
• src/modules/weapons/projectiles/MineProjectile.cc (copied) (copied from code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.cc)
• src/modules/weapons/projectiles/MineProjectile.h (copied) (copied from code/branches/particleEffectsHS15/src/modules/weapons/projectiles/MineProjectile.h)
• src/modules/weapons/projectiles/Projectile.h (modified) (1 diff)

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

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

code/branches/presentationHS15/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
 {
     RegisterClass(IceGunProjectile);
+
+    const float IceGunProjectile::particleDestructionDelay_ = 15.0f;
 
     IceGunProjectile::IceGunProjectile(Context* context) : Projectile(context)
@@ -55 +64 @@
         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");   
+        emitter_->setDeleteWithParent(false);     
+    }
+
+    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(particleDestructionDelay_, false, executor, true);
+        }
     }
 

code/branches/presentationHS15/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:         
+            static const float particleDestructionDelay_;
+        private:
+            ParticleEmitter* emitter_;
             float freezeTime_; //The duration of the freezing effect on a target
             float freezeFactor_; //The strength of the freezing effect

code/branches/presentationHS15/src/modules/weapons/projectiles/Projectile.h

@@ -69 +69 @@
         protected:
             virtual void setCollisionShapeRadius(float radius);
+            float lifetime_; //!< The time the projectile exists.
 
         private:
-            float lifetime_; //!< The time the projectile exists.
             Timer destroyTimer_; //!< Timer to destroy the projectile after its lifetime has run out.
-            WeakPtr<SphereCollisionShape> collisionShape_; // The collision shape of the projectile.            
+            WeakPtr<SphereCollisionShape> collisionShape_; // The collision shape of the projectile.
     };
 }