Changeset 9837 for code/branches

Timestamp:

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

Author:

zifloria

Message:

new Explosions!!!

Location:

code/branches/invaders/src

Files:

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

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

@@ -87 +87 @@
             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));
+        }
     }
 

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

@@ -67 +67 @@
             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;}

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

@@ -48 +48 @@
     void InvaderEnemy::tick(float dt)
     {
+        setVelocity(Vector3(500 ,0, 0));
         SUPER(InvaderEnemy, tick, dt);
     }
@@ -53 +54 @@
     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;
     }

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

@@ -43 +43 @@
     RegisterClass(BigExplosion);
 
-    BigExplosion::BigExplosion(Context* context) : StaticEntity(context)
+    BigExplosion::BigExplosion(Context* context) : MobileEntity(context)
     {
         RegisterObject(BigExplosion);
@@ -100 +100 @@
         this->debris4_->setSyncMode(0);
 
-        this->explosion_ = new StaticEntity(this->getContext());
+        this->explosion_ = new MobileEntity(this->getContext());
         this->explosion_->setSyncMode(0);
 

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

@@ -22 +22 @@
  *   Author:
  *      Benjamin de Capitani
- *   Co-authors:
+ *   Co-authors:§
  *      ...
  *
@@ -33 +33 @@
 
 #include "tools/Timer.h"
-#include "StaticEntity.h"
+#include "MobileEntity.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport BigExplosion : public StaticEntity
+    class _OrxonoxExport BigExplosion : public MobileEntity
     {
         public:
@@ -60 +60 @@
             bool                  bStop_;
 
-            StaticEntity*         explosion_;
+            MobileEntity*         explosion_;
 
             MovableEntity*        debrisEntity1_;

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

@@ -367 +367 @@
         BigExplosion* chunk = new BigExplosion(this->getContext());
         chunk->setPosition(this->getPosition());
+        chunk->setVelocity(this->getVelocity());
 
     }