Changeset 9777 for code/branches

Timestamp:

Nov 11, 2013, 4:01:44 PM (11 years ago)

Author:

zifloria

Message:

enemies

Location:

code/branches/invaders

Files:

• data/levels/Invaders.oxw (modified) (2 diffs)
• data/levels/templates/enemyInvader.oxt (added)
• src/modules/invader/CMakeLists.txt (modified) (1 diff)
• src/modules/invader/Invader.cc (modified) (2 diffs)
• src/modules/invader/Invader.h (modified) (2 diffs)
• src/modules/invader/InvaderEnemy (added)
• src/modules/invader/InvaderPrereqs.h (modified) (1 diff)
• src/modules/invader/InvaderShip.cc (modified) (3 diffs)
• src/modules/invader/InvaderShip.h (modified) (1 diff)

code/branches/invaders/data/levels/Invaders.oxw

@@ -16 +16 @@
   include("templates/spaceshipPirate.oxt")
   include("templates/spaceshipInvader.oxt")
+  include("templates/enemyInvader.oxt")
 ?>
 
@@ -55 +56 @@
     
     <?lua
-      for i = 1, 250, 1
-      do
-      j = math.random()
+      for i = 1, 300, 1 do
+        j = math.random()
     ?>
 
     <MovableEntity
-      position = "<?lua print(math.random()* 15000 - 1000) ?>,-1000,<?lua print(math.random() * 12000 - 4000) ?>"
+      position = "<?lua print(math.random()* 30000 - 1000) ?>,-1000,<?lua print(math.random() * 4000 - 2000) ?>"
       collisionType = dynamic
       linearDamping = 0.8
       angularDamping = 0
       scale = "<?lua print(j * 150)?>"
-      collisiondamage = 1
+      collisiondamage = 0
       enablecollisiondamage = true
     >

code/branches/invaders/src/modules/invader/CMakeLists.txt

@@ -4 +4 @@
   InvaderCenterPoint.cc
   InvaderShip.cc
+  InvaderEnemy.cc
   InvaderWeapon.cc
 END_BUILD_UNIT

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

@@ -42 +42 @@
 #include "chat/ChatManager.h"
 
-#include "InvaderShip.h"
 // ! HACK
 #include "infos/PlayerInfo.h"
 
 #include "InvaderCenterPoint.h"
+#include "InvaderShip.h"
+
+#include "core/command/ConsoleCommand.h"
 
 namespace orxonox
@@ -55 +57 @@
     {
         RegisterObject(Invader);
+        this->center_ = 0;
 
-        this->center_ = 0;
+        this->console_addEnemy = createConsoleCommand( "spawnEnemy", createExecutor( createFunctor(&Invader::spawnEnemy, this) ) );
         //this->context = context;
+
+        enemySpawnTimer.setTimer(2.0f, true, createExecutor(createFunctor(&Invader::spawnEnemy, this)));
     }
 
     Invader::~Invader()
     {
+    }
+
+    void Invader::spawnEnemy()
+    {
+        if (player == NULL)
+        {
+            for (ObjectList<InvaderShip>::iterator it = ObjectList<InvaderShip>::begin(); it != ObjectList<InvaderShip>::end(); ++it)
+                player = *it;
+        }
+        if (player == NULL)
+            return;
+
+        Pawn* newPawn = new Pawn(this->center_->getContext());
+        newPawn->addTemplate("enemyinvader");
+
+        newPawn->setPosition(player->getPosition() + Vector3(1000, 0, 0));
     }
 

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

@@ -42 +42 @@
 #include "InvaderCenterPoint.h"
 
+#include "tools/Timer.h"
+
 namespace orxonox
 {
@@ -56 +58 @@
             //virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
 
+            void spawnEnemy();
+
             void setCenterpoint(InvaderCenterPoint* center)
             { this->center_ = center; }
         private:
             WeakPtr<InvaderCenterPoint> center_;
+            InvaderShip * player;
+
+            ConsoleCommand* console_addEnemy;
+
+            Timer enemySpawnTimer;
             //Context* context;
     };

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

@@ -71 +71 @@
     class InvaderCenterPoint;
     class InvaderShip;
+    class InvaderEnemy;
     class InvaderWeapon;
 }

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

@@ -52 +52 @@
         isFireing = false;
         damping = 10;
-
     }
 
@@ -75 +74 @@
             ControllableEntity::fire(0);
 
+        if (getPosition().x > 30000)
+        {
+            //level++
+            setPosition(getPosition() - Vector3(30000, 0, 0));
+        }
+
+        // if ((int(getPosition().x) % 1000) < 5)
+        // {
+        //     for (ObjectList<Invader>::iterator it = ObjectList<Invader>::begin(); it != ObjectList<Invader>::end(); ++it)
+        //         it->spawnEnemy();
+        // }
 
         // camera->setOrientation(Vector3::UNIT_X, Degree(0));
@@ -81 +91 @@
         SUPER(InvaderShip, tick, dt);
     }
+
+
 
     void InvaderShip::moveFrontBack(const Vector2& value)

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

@@ -59 +59 @@
             virtual void rotatePitch(const Vector2& value){};
             virtual void rotateRoll(const Vector2& value){};
+
+            // *InvaderShip getShip(){return this;}
         private:
             Camera* camera;