Changeset 10786 for code/branches

Timestamp:

Nov 9, 2015, 3:51:17 PM (9 years ago)

Author:

vaydin

Message:

added ability to attach second particle effect to explosionpart, added ability to define range of velocity of explosionpart

Location:

code/branches/explosionChunksHS15

Files:

• data/levels/emptyLevel.oxw (modified) (3 diffs)
• src/orxonox/worldentities/ExplosionPart.cc (modified) (7 diffs)
• src/orxonox/worldentities/ExplosionPart.h (modified) (3 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/explosionChunksHS15/data/levels/emptyLevel.oxw

@@ -34 +34 @@
         team                = "1"
         position            = "1000,0,0"
-   explosionchunks        = 60
         >
         <templates>
-                      <Template link=spaceshipassff />
+          <Template link=spaceshipassff />
         </templates>
+
+        <explosion >
+          <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+          <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+          <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
+        </explosion>
           
                     
@@ -47 +52 @@
         >
         <templates>
-                      <Template link=spaceshipassff />
-                    </templates>
-                    <explosion>
+          <Template link=spaceshipassff />
+        </templates>
 
-          <ExplosionPart mesh="ship.mesh" effect="Orxonox/smoke7" />
-          <ExplosionPart mesh="ship.mesh" effect="Orxonox/smoke7" />
+        <explosion >
+          <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
+          <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
+          <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
 
+          <ExplosionPart minspeed=0 maxspeed=0 effect1="Orxonox/explosion2b" effect2="Orxonox/smoke6" />
+          <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+          <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+          <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+          <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+          <ExplosionPart mesh="CockpitDebris.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+          <ExplosionPart mesh="BodyDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+          <ExplosionPart mesh="WingDebris1.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
+          <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" />
         </explosion>
                     
@@ -62 +77 @@
         >
         <templates>
-                      <Template link=spaceshipassff />
-                    </templates>
-                    <explosion>
+          <Template link=spaceshipassff />
+        </templates>
 
-          <ExplosionPart mesh="ship.mesh" effect="Orxonox/smoke7" />
-          <ExplosionPart mesh="ship.mesh" effect="Orxonox/smoke7" />
+        <explosion>
+          
+        </explosion>
 
-        </explosion>
+        
                     
     </SpaceShip>

code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.cc

@@ -43 +43 @@
         this->LOD_ = LODParticle::Normal;
                 this->mesh_ = "";
-                this->effect_ = "";
+                this->effect1_ = "";
+                this->effect2_ = "";
                 this->model_= new Model(this->getContext());
-                this->particleInterface_= NULL;
+                this->effect1Particle_= NULL;
+                this->effect2Particle_= NULL;
                 this->explosionEntity_ = new MovableEntity(this->getContext());
 
@@ -53 +55 @@
 
 
+        ExplosionPart::~ExplosionPart()
+    {
+        if (this->isInitialized())
+        {
+            if (this->effect1Particle_)
+            {
+                this->model_->detachOgreObject(this->effect1Particle_->getParticleSystem());
+                delete this->effect1Particle_;
+            }
+            if (this->effect2Particle_)
+            {
+                this->model_->detachOgreObject(this->effect2Particle_->getParticleSystem());
+                delete this->effect2Particle_;
+            }
+        }
+    }
+
+
         void ExplosionPart::XMLPort(Element& xmlelement, XMLPort::Mode mode)
         {
                 SUPER(ExplosionPart, XMLPort, xmlelement, mode);
 
-                XMLPortParam(ExplosionPart, "mesh", setMesh, getMesh, xmlelement, mode);
-                XMLPortParam(ExplosionPart, "effect", setEffect, getEffect, xmlelement, mode);
+                XMLPortParam(ExplosionPart, "mesh", setMesh, getMesh, xmlelement, mode).defaultValues("");
+                XMLPortParam(ExplosionPart, "minspeed", setMinSpeed, getMinSpeed, xmlelement, mode).defaultValues(50);
+                XMLPortParam(ExplosionPart, "maxspeed", setMaxSpeed, getMaxSpeed, xmlelement, mode).defaultValues(100);
+                XMLPortParam(ExplosionPart, "effect1", setEffect1, getEffect1, xmlelement, mode).defaultValues("");
+                XMLPortParam(ExplosionPart, "effect2", setEffect2, getEffect2, xmlelement, mode).defaultValues("");
 
 
@@ -68 +91 @@
                 orxout() << "Explode" << endl;
 
-                orxout() << getMesh() << endl;
-                orxout() << getEffect() << endl;
 
                 this->model_->setVisible(true);
@@ -77 +98 @@
                 //this->model_->setSyncMode(0);
 
-                this->particleInterface_ = new ParticleInterface(this->getScene()->getSceneManager(), effect_, this->LOD_);
+                if(effect1_ != "")
+                {
+                        this->effect1Particle_ = new ParticleInterface(this->getScene()->getSceneManager(), effect1_, this->LOD_);
+                        this->model_->attachOgreObject(this->effect1Particle_->getParticleSystem());
+                }
 
-                this->model_->attachOgreObject(this->particleInterface_->getParticleSystem());
+                if(effect2_ != "")
+                {
+                        this->effect2Particle_ = new ParticleInterface(this->getScene()->getSceneManager(), effect2_, this->LOD_);
+                        this->model_->attachOgreObject(this->effect2Particle_->getParticleSystem());
+                }       
 
-                
-
-                this->explosionEntity_->setVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1))*rnd(50,100));
+                this->explosionEntity_->setVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1))*rnd(minSpeed_,maxSpeed_));
         this->explosionEntity_->setAngularVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1)).normalisedCopy() * Degree(400).valueRadians());
         this->explosionEntity_->setScale(4);
@@ -91 +118 @@
         this->attach(explosionEntity_);
 
+        if (GameMode::isMaster())
+        {
+            this->destroyTimer_.setTimer(rnd(2, 3), false, createExecutor(createFunctor(&ExplosionPart::stop, this)));
+        }
+
+        }
+
+        void ExplosionPart::stop()
+        {
+                if (this->effect1Particle_)
+            this->effect1Particle_->setEnabled(false);
+        if (this->effect2Particle_)
+            this->effect2Particle_->setEnabled(false);
+        if (this->model_)
+            this->model_->setVisible(false);
+
+        if (GameMode::isMaster())
+        {
+            this->bStop_ = true;
+            this->destroyTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&ExplosionPart::destroy, this)));
+        }
         }
 
@@ -98 +146 @@
         void ExplosionPart::setMesh(const std::string& newString)
         {
-                this->mesh_ = newString;
-                this->model_->setMeshSource(mesh_);
-                this->model_->setVisible(false);
-                orxout() << newString << endl;
+                if(newString != "")
+                {
+                        this->mesh_ = newString;
+                        this->model_->setMeshSource(mesh_);
+                        this->model_->setVisible(false);
+                }
         }
 
-        void ExplosionPart::setEffect(const std::string& newString)
+        void ExplosionPart::setEffect1(const std::string& newString)
         {
-                this->effect_ = newString;
+                this->effect1_ = newString;
+        }
+
+        void ExplosionPart::setEffect2(const std::string& newString)
+        {
+                this->effect2_ = newString;
+        }
+
+        void ExplosionPart::setMinSpeed(float speed)
+        {
+                this->minSpeed_ = speed;
+        }
+
+        void ExplosionPart::setMaxSpeed(float speed)
+        {
+                this->maxSpeed_ = speed;
         }
 
@@ -112 +177 @@
         { return this->mesh_; }
 
-        std::string& ExplosionPart::getEffect()
-        { return this->effect_; }
+        std::string& ExplosionPart::getEffect1()
+        { return this->effect1_; }
+
+        std::string& ExplosionPart::getEffect2()
+        { return this->effect2_; }
+
+        float ExplosionPart::getMinSpeed()
+        {
+                return this->minSpeed_;
+        }
+
+        float ExplosionPart::getMaxSpeed()
+        {
+                return this->maxSpeed_;
+        }
+
 
 

code/branches/explosionChunksHS15/src/orxonox/worldentities/ExplosionPart.h

@@ -41 +41 @@
 #include "core/command/Executor.h"
 #include "Scene.h"
+#include "tools/Timer.h"
 
 
@@ -49 +50 @@
         public:
             ExplosionPart(Context* context);
+            ~ExplosionPart();
             void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             void Explode();
+            void stop();
 
             void setMesh(const std::string& newString);
             std::string& getMesh();
-            void setEffect(const std::string& newString);
-            std::string& getEffect();
+            void setEffect1(const std::string& newString);
+            std::string& getEffect1();
+            void setEffect2(const std::string& newString);
+            std::string& getEffect2();
+            void setMinSpeed(float speed);
+            float getMinSpeed();
+            void setMaxSpeed(float speed);
+            float getMaxSpeed();
          
 
@@ -65 +74 @@
 
                 Model* model_;
-                ParticleInterface* particleInterface_;
+                ParticleInterface* effect1Particle_;
+            ParticleInterface* effect2Particle_;
 
+
+            float minSpeed_;
+            float maxSpeed_;
                 std::string mesh_;
-                std::string effect_;
+                std::string effect1_;
+            std::string effect2_;
 
             MovableEntity* explosionEntity_;
+
+            Timer destroyTimer_;
 
                 

code/branches/explosionChunksHS15/src/orxonox/worldentities/pawns/Pawn.cc

@@ -374 +374 @@
             if (GameMode::isMaster())
             {
-                this->deatheffect();
+                //this->deatheffect();
                 this->goWithStyle();
             }