Changeset 10937 for code/branches/explosionChunksHS15/src/orxonox/worldentities

Timestamp:

Dec 7, 2015, 3:32:07 PM (9 years ago)

Author:

vaydin

Message:

Finalized everything deleted now unnecessary BigExplosion

Location:

code/branches/explosionChunksHS15/src/orxonox/worldentities

Files:

• CMakeLists.txt (modified) (1 diff)
• ExplosionPart.cc (modified) (8 diffs)
• ExplosionPart.h (modified) (2 diffs)
• pawns/Pawn.cc (modified) (2 diffs)

code/branches/explosionChunksHS15/src/orxonox/worldentities/CMakeLists.txt

@@ -6 +6 @@
   ControllableEntity.cc
   Drone.cc
-  BigExplosion.cc
   EffectContainer.cc
   ExplosionChunk.cc

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

@@ -26 +26 @@
  *
  */
+
 
 
@@ -86 +87 @@
                 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);
         }
@@ -120 +120 @@
                 //this->model_->setSyncMode(0);
 
+
                 if(effect1_ != "")
                 {
                         this->effect1Particle_ = new ParticleInterface(this->getScene()->getSceneManager(), effect1_, this->LOD_);
+                        this->effect1Particle_->setDimensions(this->getScale());
                         this->model_->attachOgreObject(this->effect1Particle_->getParticleSystem());
                 }
@@ -129 +131 @@
                 {
                         this->effect2Particle_ = new ParticleInterface(this->getScene()->getSceneManager(), effect2_, this->LOD_);
+                        this->effect2Particle_->setDimensions(this->getScale());
                         this->model_->attachOgreObject(this->effect2Particle_->getParticleSystem());
                 }
+
+
 
                 
@@ -144 +149 @@
                 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_->setScale(this->getScale() * 4);
+
 
         this->explosionEntity_->attach(model_);
+
 
         this->attach(explosionEntity_);
@@ -192 +199 @@
         {
                 this->posOffset_ = newVector;
-                this->explosionEntity_->setPosition(this->getPosition() + this->posOffset_);
+                this->explosionEntity_->setPosition(this->getPosition() + this->posOffset_ / this->getScale());
         }
 
@@ -203 +210 @@
         {
                 this->angle_ = newAngle;
-        }
-
-        void ExplosionPart::setSize(float newSize)
-        {
-                this->size_ = newSize;
         }
 
@@ -249 +251 @@
         }
 
-        float ExplosionPart::getSize()
-        {
-                return size_;
-        }
-
         float ExplosionPart::getDelay()
         {

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

@@ -72 +72 @@
             void setAngle(float newAgnle);
             float getAngle();
-            void setSize(float newSize);
-            float getSize();
             void setDelay(float newDelay);
             float getDelay();
@@ -97 +95 @@
             Vector3 direction_;
             float angle_;
-            float size_;
             float delay_;
 

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

@@ -41 +41 @@
 #include "graphics/ParticleSpawner.h"
 #include "worldentities/ExplosionChunk.h"
-#include "worldentities/BigExplosion.h"
 #include "worldentities/ExplosionPart.h"
 #include "weaponsystem/WeaponSystem.h"
@@ -380 +379 @@
     void Pawn::goWithStyle()
     {
-        orxout() << "gowithstyle" << endl;
-
 
         this->bAlive_ = false;