Changeset 9879

Timestamp:

Dec 9, 2013, 2:08:26 PM (11 years ago)

Author:

zifloria

Message:

tweaking + still trying to figure out explosions

Location:

code/branches/invaders/src

Files:

• modules/invader/Invader.cc (modified) (2 diffs)
• modules/invader/InvaderWeaponEnemy.cc (modified) (1 diff)
• orxonox/worldentities/BigExplosion.cc (modified) (2 diffs)
• orxonox/worldentities/BigExplosion.h (modified) (1 diff)
• orxonox/worldentities/pawns/Pawn.cc (modified) (4 diffs)

code/branches/invaders/src/modules/invader/Invader.cc

@@ -69 +69 @@
         bEndGame = false;
         lives = 3;
-        // TODO:
         level = 1;
         point = 0;
@@ -114 +113 @@
             return;
         srand(player->getPosition().x + player->getPosition().y);
-        for (int i = 0; i < (3*log(level) + 1); i++)
+        for (int i = 0; i < (3*log10(level) + 1); i++)
         {
             WeakPtr<InvaderEnemy> newPawn;

code/branches/invaders/src/modules/invader/InvaderWeaponEnemy.cc

@@ -48 +48 @@
         // SUPER(InvaderWeaponEnemy, shot);
         // only shoot in foreward direction
-        projectile->setVelocity(Vector3(1, 0, 0) * -500);
+        projectile->setVelocity(Vector3(1, 0, 0) * 300);
         // projectile->setOrientation(Quaternion(sqrt(0.5),0,sqrt(0.5),0));
     }

code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc

@@ -78 +78 @@
     }
 
+    BigExplosion::BigExplosion(Context* context, Vector3 initVelocity) : MobileEntity(context)
+    {
+        RegisterObject(BigExplosion);
+        this->setVelocity(initVelocity);
+
+        if ( GameMode::showsGraphics() && ( !this->getScene() || !this->getScene()->getSceneManager() ) )
+            ThrowException(AbortLoading, "Can't create BigExplosion, no scene or no scene manager given.");
+
+        this->bStop_ = false;
+        this->LOD_ = LODParticle::Normal;
+
+        if ( GameMode::showsGraphics() )
+        {
+            try
+            {
+                this->init();
+            }
+            catch (const std::exception& ex)
+            {
+                orxout(internal_error) << "Couldn't load particle effect in BigExplosion: " << ex.what() << endl;
+                this->initZero();
+            }
+        }
+        else
+        {
+            this->initZero();
+        }
+
+        if (GameMode::isMaster())
+        {
+            this->destroyTimer_.setTimer(rnd(2, 4), false, createExecutor(createFunctor(&BigExplosion::stop, this)));
+        }
+
+        this->registerVariables();
+    }
+
     void BigExplosion::init()
     {
@@ -152 +188 @@
         //
         ParticleSpawner* effect = new ParticleSpawner(this->getContext());
-        // orxout() << "vel " << getVelocity() << endl;
-        // effect->setVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1))*rnd(10, 200));
+        orxout() << "vel " << this->getVelocity() << endl;
+        // effect->setVelocity(this->getVelocity());
         effect->setDestroyAfterLife(true);
         effect->setSource("Orxonox/explosion2b");

code/branches/invaders/src/orxonox/worldentities/BigExplosion.h

@@ -41 +41 @@
         public:
             BigExplosion(Context* context);
+            BigExplosion(Context* context, Vector3 initVelocity);
             virtual ~BigExplosion();
 

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

@@ -365 +365 @@
         this->setDestroyWhenPlayerLeft(false);
 
-        BigExplosion* chunk = new BigExplosion(this->getContext());
+        orxout() << "big explosion: " << this->getVelocity() << endl;
+        BigExplosion* chunk = new BigExplosion(this->getContext(), this->getVelocity());
         chunk->setPosition(this->getPosition());
-        chunk->setVelocity(this->getVelocity());
+        // chunk->setVelocity(this->getVelocity());
 
     }
@@ -377 +378 @@
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
+            effect->setVelocity(this->getVelocity());
             effect->setDestroyAfterLife(true);
             effect->setSource("Orxonox/explosion2b");
@@ -385 +387 @@
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
+            effect->setVelocity(this->getVelocity());
             effect->setDestroyAfterLife(true);
             effect->setSource("Orxonox/smoke6");
@@ -393 +396 @@
             effect->setPosition(this->getPosition());
             effect->setOrientation(this->getOrientation());
+            effect->setVelocity(this->getVelocity());
             effect->setDestroyAfterLife(true);
             effect->setSource("Orxonox/sparks");