Changeset 10152 for code/branches/surfaceraceHS14/src

Timestamp:

Dec 3, 2014, 5:18:24 PM (10 years ago)

Author:

sriedel

Message:

Almost there. Death doesnt work

Location:

code/branches/surfaceraceHS14/src/modules/dodgerace2

Files:

• CMakeLists.txt (modified) (1 diff)
• DodgeRace.cc (modified) (4 diffs)
• DodgeRace.h (modified) (3 diffs)
• DodgeRaceCube.cc (added)
• DodgeRaceCube.h (added)
• DodgeRacePrereqs.h (modified) (1 diff)
• DodgeRaceShip.cc (modified) (2 diffs)

code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt

@@ -3 +3 @@
 DodgeRaceCenterPoint.cc
 DodgeRaceShip.cc
+DodgeRaceCube.cc
 DodgeRaceHUDinfo.cc
 )

code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc

@@ -34 +34 @@
 #include "DodgeRace.h"
 #include "DodgeRaceShip.h" // Necessary for getPlayer function. Do NOT include this in Header!
+#include "DodgeRaceCube.h"
 
 namespace orxonox
@@ -59 +60 @@
         b_combo = false;
         counter = 0;
+        pattern = 1;
         lastPosition = 0;
         // spawn enemy every 3.5 seconds
@@ -94 +96 @@
                         lastPosition = currentPosition;
 
-                        if(counter >= 5000)
+                        for(int i=0; i< cubeList.size();i++)
+                        {
+                                if(cubeList.at(i)->getPosition().x < currentPosition-3000)
+                                {
+                                        cubeList.at(i)->destroy();
+                                        cubeList.erase(cubeList.begin()+i);
+                                }
+                        }
+
+                        if(counter >= 3000)
                         {
                                 counter = 0;
 
-                                WeakPtr<StaticEntity> stentity = new StaticEntity(this->center_->getContext()); //this->center_->getContext()
-                                stentity->addTemplate("DodgeRaceCube01");
-
-                                stentity->setPosition(getPlayer()->getWorldPosition() + Vector3(5000, 0, 0));
-                                //stentity->setScale3D(50,50,50);
+                                for(int i = 0; i<6; i++)
+                                {
+                                        WeakPtr<DodgeRaceCube> cube = new DodgeRaceCube(this->center_->getContext());
+                                        cubeList.push_back(cube);
+                                        switch(pattern)
+                                        {
+                                        case 1: cube->addTemplate("DodgeRaceCube01");
+                                        break;
+                                        case 2: cube->addTemplate("DodgeRaceCube02");
+                                        break;
+
+                                        }
+
+                                        cube->setPosition(getPlayer()->getWorldPosition() + Vector3(5000, 0, -3600 + (i*1200)));
+                                        //stEntity->setScale3D(50,50,50);
+                                }
+
+
+                                pattern %= 2;
+                                pattern ++;
+
                         }
+
         }
         SUPER(DodgeRace, tick, dt);
@@ -166 +194 @@
     void DodgeRace::start()
     {
+        orxout() << "start function called." << endl;
         init();
+                for(int i=0; i< cubeList.size();i++)
+                {
+                        cubeList.at(i)->destroy();
+                        cubeList.erase(cubeList.begin()+i);
+
+                }
+        cubeList.clear();
         // Set variable to temporarily force the player to spawn.
         this->bForceSpawn_ = true;

code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h

@@ -51 +51 @@
 #include "gamestates/GSLevel.h"
 #include "chat/ChatManager.h"
+#include <vector>
 
 // ! HACK
@@ -96 +97 @@
             int multiplier;
             int counter;
+            int pattern;
             int currentPosition;
             int lastPosition;
@@ -102 +104 @@
             WeakPtr<DodgeRaceShip> getPlayer();
             WeakPtr<DodgeRaceShip> player;
+            std::vector<DodgeRaceCube*> cubeList;
             void toggleShowLevel(){bShowLevel = !bShowLevel;}
             void addPoints(int numPoints);

code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h

@@ -71 +71 @@
     class DodgeRaceCenterPoint;
     class DodgeRaceShip;
+    class DodgeRaceCube;
     //class DodgeRaceEnemy;
     //class DodgeRaceEnemyShooter;

code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc

@@ -75 +75 @@
                 velocity.y = 0;
                 // restart if game ended
+                /*
                 if (getGame())
                     if (getGame()->bEndGame)
@@ -80 +81 @@
                         getGame()->start();
                         return;
-                    }
+                    }*/
             }
             /*