Changeset 10837 for code/branches/explosionChunksHS15/src

Timestamp:

Nov 23, 2015, 3:46:58 PM (9 years ago)

Author:

vaydin

Message:

fixed position offset, added definable direction for the meshes to fly in, added size, added delay

Location:

code/branches/explosionChunksHS15/src/orxonox/worldentities

Files:

• ExplosionPart.cc (modified) (5 diffs)
• ExplosionPart.h (modified) (3 diffs)
• pawns/Pawn.cc (modified) (1 diff)

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

@@ -84 +84 @@
                 XMLPortParam(ExplosionPart, "effect2", setEffect2, getEffect2, xmlelement, mode).defaultValues("");
                 XMLPortParam(ExplosionPart, "offset", setOffset, getOffset, xmlelement, mode).defaultValues(Vector3::ZERO);
-
-
+                XMLPortParam(ExplosionPart, "direction", setDirection, getDirection, xmlelement, mode).defaultValues(Vector3(1,1,1));
+                XMLPortParam(ExplosionPart, "angle", setAngle, getAngle, xmlelement, mode).defaultValues(180);
+                XMLPortParam(ExplosionPart, "size", setSize, getSize, xmlelement, mode).defaultValues(4);
+                XMLPortParam(ExplosionPart, "delay", setDelay, getDelay, xmlelement, mode).defaultValues(0);
         }
 
@@ -91 +93 @@
         void ExplosionPart::Explode()
         {
-                orxout() << "Explode" << endl;
-
-
-
-                this->model_->setVisible(true);
-
-                //this->explosionEntity_->setSyncMode(0);
-
-                //this->model_->setSyncMode(0);
-
-                if(effect1_ != "")
-                {
-                        this->effect1Particle_ = new ParticleInterface(this->getScene()->getSceneManager(), effect1_, this->LOD_);
-                        this->model_->attachOgreObject(this->effect1Particle_->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(minSpeed_,maxSpeed_));
-        this->explosionEntity_->setAngularVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1)).normalisedCopy() * Degree(400).valueRadians());
-        this->explosionEntity_->setScale(4);
-
-        this->explosionEntity_->attach(model_);
-
-        this->attach(explosionEntity_);
-
-        if (GameMode::isMaster())
-        {
-            this->destroyTimer_.setTimer(rnd(2, 4), false, createExecutor(createFunctor(&ExplosionPart::stop, this)));
-        }
-
+                this->destroyTimer_.setTimer(delay_, false, createExecutor(createFunctor(&ExplosionPart::ActuallyExplode, this)));
         }
 
@@ -144 +112 @@
         }
 
+        void ExplosionPart::ActuallyExplode()
+        {
+                this->model_->setVisible(true);
+
+                //this->explosionEntity_->setSyncMode(0);
+
+                //this->model_->setSyncMode(0);
+
+                if(effect1_ != "")
+                {
+                        this->effect1Particle_ = new ParticleInterface(this->getScene()->getSceneManager(), effect1_, this->LOD_);
+                        this->model_->attachOgreObject(this->effect1Particle_->getParticleSystem());
+                }
+
+                if(effect2_ != "")
+                {
+                        this->effect2Particle_ = new ParticleInterface(this->getScene()->getSceneManager(), effect2_, this->LOD_);
+                        this->model_->attachOgreObject(this->effect2Particle_->getParticleSystem());
+                }
+
+                
+        Vector3 velocityOffset = direction_.perpendicular();
+        velocityOffset.normalise();
+        Degree offsetDirection = Degree(rnd(0,360));
+        velocityOffset = Quaternion(offsetDirection, direction_.normalisedCopy()) * velocityOffset;
+        velocityOffset.normalise();
+        direction_.normalise();
+
+        Vector3 finalDirection = direction_ + sin((rnd(0, angle_))*M_PI/180)*velocityOffset;
+
+                this->explosionEntity_->setVelocity(finalDirection*rnd(minSpeed_,maxSpeed_));
+        this->explosionEntity_->setAngularVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1)).normalisedCopy() * Degree(400).valueRadians());
+        this->explosionEntity_->setScale(size_);
+
+        this->explosionEntity_->attach(model_);
+
+        this->attach(explosionEntity_);
+
+        if (GameMode::isMaster())
+        {
+            this->destroyTimer_.setTimer(rnd(2, 4), false, createExecutor(createFunctor(&ExplosionPart::stop, this)));
+        }
+        }
+
 
 
@@ -180 +192 @@
         {
                 this->posOffset_ = newVector;
-                this->setPosition(this->getPosition() + this->posOffset_);
+                this->explosionEntity_->setPosition(this->getPosition() + this->posOffset_);
+        }
+
+        void ExplosionPart::setDirection(Vector3 newDirection)
+        {
+                this->direction_ = newDirection;
+        }
+
+        void ExplosionPart::setAngle(float newAngle)
+        {
+                this->angle_ = newAngle;
+        }
+
+        void ExplosionPart::setSize(float newSize)
+        {
+                this->size_ = newSize;
+        }
+
+        void ExplosionPart::setDelay(float newDelay)
+        {
+                this->delay_ = newDelay;
         }
 
@@ -207 +239 @@
         }
 
+        Vector3 ExplosionPart::getDirection()
+        {
+                return direction_;
+        }
+
+        float ExplosionPart::getAngle()
+        {
+                return angle_;
+        }
+
+        float ExplosionPart::getSize()
+        {
+                return size_;
+        }
+
+        float ExplosionPart::getDelay()
+        {
+                return delay_;
+        }
+
 
 

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

@@ -54 +54 @@
             void Explode();
             void stop();
+            void ActuallyExplode();
 
             void setMesh(const std::string& newString);
@@ -67 +68 @@
             void setOffset(Vector3 newVector);
             Vector3 getOffset();
+            void setDirection(Vector3 newDirection);
+            Vector3 getDirection();
+            void setAngle(float newAgnle);
+            float getAngle();
+            void setSize(float newSize);
+            float getSize();
+            void setDelay(float newDelay);
+            float getDelay();
          
 
@@ -86 +95 @@
             std::string effect2_;
             Vector3 posOffset_;
+            Vector3 direction_;
+            float angle_;
+            float size_;
+            float delay_;
 
             MovableEntity* explosionEntity_;

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

@@ -390 +390 @@
             explosionPartList_.back()->setPosition(this->getPosition());
             explosionPartList_.back()->setVelocity(this->getVelocity());
+            explosionPartList_.back()->setOrientation(this->getOrientation());
             explosionPartList_.back()->Explode();
             explosionPartList_.pop_back();