[Orxonox-commit 5172] r9837 - in code/branches/invaders/src: modules/invader orxonox/worldentities orxonox/worldentities/pawns

[zifloria at orxonox.net]

Author: zifloria
Date: 2013-12-02 14:08:46 +0100 (Mon, 02 Dec 2013)
New Revision: 9837

Modified:
   code/branches/invaders/src/modules/invader/Invader.cc
   code/branches/invaders/src/modules/invader/Invader.h
   code/branches/invaders/src/modules/invader/InvaderEnemy.cc
   code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc
   code/branches/invaders/src/orxonox/worldentities/BigExplosion.h
   code/branches/invaders/src/orxonox/worldentities/pawns/Pawn.cc
Log:
new Explosions!!!


Modified: code/branches/invaders/src/modules/invader/Invader.cc
===================================================================
--- code/branches/invaders/src/modules/invader/Invader.cc	2013-12-02 12:50:05 UTC (rev 9836)
+++ code/branches/invaders/src/modules/invader/Invader.cc	2013-12-02 13:08:46 UTC (rev 9837)
@@ -86,10 +86,12 @@
         if (player == NULL)
             return;
 
-        InvaderEnemy* newPawn = new InvaderEnemy(this->center_->getContext());
-        newPawn->addTemplate("enemyinvader");
-
-        newPawn->setPosition(player->getPosition() + Vector3(1000, 0, 0)); // BUG: 
+        for (int i = 0; i < level; i++)
+        {
+            SmartPtr<InvaderEnemy> newPawn = new InvaderEnemy(this->center_->getContext());
+            newPawn->addTemplate("enemyinvader");
+            newPawn->setPosition(player->getPosition() + Vector3(500 + 100 * i, 0, 0));
+        }
     }
 
     void Invader::comboControll()

Modified: code/branches/invaders/src/modules/invader/Invader.h
===================================================================
--- code/branches/invaders/src/modules/invader/Invader.h	2013-12-02 12:50:05 UTC (rev 9836)
+++ code/branches/invaders/src/modules/invader/Invader.h	2013-12-02 13:08:46 UTC (rev 9837)
@@ -66,7 +66,7 @@
             int getLevel(){return this->level;}
             int getPoints(){return this->point;}
 
-            void costLife(){lives--; if (lives == 0) orxout() << "end<<<<<<<<<<<<<<<<<" << endl;};
+            void costLife(){lives--; if (lives <= 0) end();};
             void levelUp(){level++;}
             void addPoints(int numPoints){point += numPoints * multiplier; b_combo = true;}
             void comboControll();

Modified: code/branches/invaders/src/modules/invader/InvaderEnemy.cc
===================================================================
--- code/branches/invaders/src/modules/invader/InvaderEnemy.cc	2013-12-02 12:50:05 UTC (rev 9836)
+++ code/branches/invaders/src/modules/invader/InvaderEnemy.cc	2013-12-02 13:08:46 UTC (rev 9837)
@@ -47,14 +47,14 @@
 
     void InvaderEnemy::tick(float dt)
     {
+        setVelocity(Vector3(500 ,0, 0));
         SUPER(InvaderEnemy, tick, dt);
     }
 
     inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        orxout() << "sadsadasfasf" << endl;
+        setVelocity(Vector3(900,0,0));
         removeHealth(2000);
-        setVelocity(Vector3(0,0,1000));
         return false;
     }
 

Modified: code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc
===================================================================
--- code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc	2013-12-02 12:50:05 UTC (rev 9836)
+++ code/branches/invaders/src/orxonox/worldentities/BigExplosion.cc	2013-12-02 13:08:46 UTC (rev 9837)
@@ -42,7 +42,7 @@
 {
     RegisterClass(BigExplosion);
 
-    BigExplosion::BigExplosion(Context* context) : StaticEntity(context)
+    BigExplosion::BigExplosion(Context* context) : MobileEntity(context)
     {
         RegisterObject(BigExplosion);
 
@@ -99,7 +99,7 @@
         this->debris3_->setSyncMode(0);
         this->debris4_->setSyncMode(0);
 
-        this->explosion_ = new StaticEntity(this->getContext());
+        this->explosion_ = new MobileEntity(this->getContext());
         this->explosion_->setSyncMode(0);
 
         this->debrisSmoke1_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/smoke7", this->LOD_);

Modified: code/branches/invaders/src/orxonox/worldentities/BigExplosion.h
===================================================================
--- code/branches/invaders/src/orxonox/worldentities/BigExplosion.h	2013-12-02 12:50:05 UTC (rev 9836)
+++ code/branches/invaders/src/orxonox/worldentities/BigExplosion.h	2013-12-02 13:08:46 UTC (rev 9837)
@@ -21,7 +21,7 @@
  *
  *   Author:
  *      Benjamin de Capitani
- *   Co-authors:
+ *   Co-authors:§
  *      ...
  *
  */
@@ -32,11 +32,11 @@
 #include "OrxonoxPrereqs.h"
 
 #include "tools/Timer.h"
-#include "StaticEntity.h"
+#include "MobileEntity.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport BigExplosion : public StaticEntity
+    class _OrxonoxExport BigExplosion : public MobileEntity
     {
         public:
             BigExplosion(Context* context);
@@ -59,7 +59,7 @@
 
             bool                  bStop_;
 
-            StaticEntity*         explosion_;
+            MobileEntity*         explosion_;
 
             MovableEntity*        debrisEntity1_;
             MovableEntity*        debrisEntity2_;

Modified: code/branches/invaders/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/invaders/src/orxonox/worldentities/pawns/Pawn.cc	2013-12-02 12:50:05 UTC (rev 9836)
+++ code/branches/invaders/src/orxonox/worldentities/pawns/Pawn.cc	2013-12-02 13:08:46 UTC (rev 9837)
@@ -366,6 +366,7 @@
 
         BigExplosion* chunk = new BigExplosion(this->getContext());
         chunk->setPosition(this->getPosition());
+        chunk->setVelocity(this->getVelocity());
 
     }
     void Pawn::deatheffect()