Changeset 10624 for code/trunk/src/modules/dodgerace

Timestamp:

Oct 4, 2015, 9:12:21 PM (9 years ago)

Author:

landauf

Message:

merged branch core7 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/dodgerace/CMakeLists.txt (modified) (1 diff)
• src/modules/dodgerace/DodgeRace.cc (modified) (9 diffs)
• src/modules/dodgerace/DodgeRace.h (modified) (3 diffs)
• src/modules/dodgerace/DodgeRaceCenterPoint.cc (modified) (1 diff)
• src/modules/dodgerace/DodgeRaceCenterPoint.h (modified) (1 diff)
• src/modules/dodgerace/DodgeRaceCube.cc (modified) (1 diff)
• src/modules/dodgerace/DodgeRaceHUDinfo.cc (modified) (1 diff)
• src/modules/dodgerace/DodgeRaceShip.cc (modified) (3 diffs)
• src/modules/dodgerace/DodgeRaceShip.h (modified) (2 diffs)

code/trunk/src/modules/dodgerace/CMakeLists.txt

@@ -8 +8 @@
 
 ORXONOX_ADD_LIBRARY(dodgerace
-  MODULE
+  PLUGIN
   FIND_HEADER_FILES
   LINK_LIBRARIES

code/trunk/src/modules/dodgerace/DodgeRace.cc

@@ -35 +35 @@
 #include "DodgeRaceShip.h" // Necessary for getPlayer function. Do NOT include this in Header!
 #include "DodgeRaceCube.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox
@@ -43 +44 @@
     {
         RegisterObject(DodgeRace);
-        init();
-        this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
-        this->center_ = 0;
-
-        this->setHUDTemplate("DodgeRaceHUD");
-    }
-
-    void DodgeRace::init()
-    {
+
         bEndGame = false;
         lives = 1;
@@ -65 +58 @@
         //enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&DodgeRace::spawnEnemy, this)));
         comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&DodgeRace::comboControll, this)));
+        this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
+        this->center_ = 0;
+
+        this->setHUDTemplate("DodgeRaceHUD");
     }
 
@@ -74 +71 @@
             for (int i = 0; i < 7; i++)
             {
-                WeakPtr<BigExplosion> chunk = new BigExplosion(this->center_->getContext());
+                BigExplosion* chunk = new BigExplosion(this->center_->getContext());
                 chunk->setPosition(Vector3(600, 0, 100.f * i - 300));
                 chunk->setVelocity(Vector3(1000, 0, 0));  //player->getVelocity()
@@ -90 +87 @@
         if (getPlayer() != NULL)
         {
-            //WeakPtr<DodgeRaceShip> ship = getPlayer();
-
             currentPosition = getPlayer()->getWorldPosition().x;
             counter = counter + (currentPosition - lastPosition);
@@ -112 +107 @@
                 for(int i = 0; i<6; i++)
                 {
-                    WeakPtr<DodgeRaceCube> cube = new DodgeRaceCube(this->center_->getContext());
+                    DodgeRaceCube* cube = new DodgeRaceCube(this->center_->getContext());
                     cubeList.push_back(cube);
                     switch(pattern)
@@ -137 +132 @@
     }
 
-    WeakPtr<DodgeRaceShip> DodgeRace::getPlayer()
+    DodgeRaceShip* DodgeRace::getPlayer()
     {
         if (player == NULL)
@@ -168 +163 @@
     {
         orxout() << "start" << endl;
-        init();
         for(unsigned int i=0; i< cubeList.size();i++)
         {
@@ -199 +193 @@
         /*
         orxout() << "prespawn" << endl;
-        init();
         for(int i=0; i< cubeList.size();i++)
         {

code/trunk/src/modules/dodgerace/DodgeRace.h

@@ -44 +44 @@
 
 
-#include "core/CoreIncludes.h"
 #include "core/EventIncludes.h"
 #include "core/command/Executor.h"
@@ -69 +68 @@
        public:
             DodgeRace(Context* context);
-
-            void init();
 
             virtual void start();
@@ -106 +103 @@
             Timer endGameTimer;
 
-            WeakPtr<DodgeRaceShip> getPlayer();
+            DodgeRaceShip* getPlayer();
             WeakPtr<DodgeRaceShip> player;
             std::vector<DodgeRaceCube*> cubeList;

code/trunk/src/modules/dodgerace/DodgeRaceCenterPoint.cc

@@ -54 +54 @@
     }
 
-    void DodgeRaceCenterPoint::changedGametype()
-    {
-        SUPER(DodgeRaceCenterPoint, changedGametype);
-
-        // Check, whether it's still DodgeRace.
-        this->checkGametype();
-    }
-
     void DodgeRaceCenterPoint::checkGametype()
     {
         if (this->getGametype() != NULL && this->getGametype()->isA(Class(DodgeRace)))
         {
-            DodgeRace* DodgeRaceGametype = orxonox_cast<DodgeRace*>(this->getGametype().get());
+            DodgeRace* DodgeRaceGametype = orxonox_cast<DodgeRace*>(this->getGametype());
             DodgeRaceGametype->setCenterpoint(this);
         }

code/trunk/src/modules/dodgerace/DodgeRaceCenterPoint.h

@@ -52 +52 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            virtual void changedGametype(); //!< Is called when the gametype has changed.
         private:
             void checkGametype();

code/trunk/src/modules/dodgerace/DodgeRaceCube.cc

@@ -33 +33 @@
 #include "DodgeRaceCube.h"
 #include "DodgeRace.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox

code/trunk/src/modules/dodgerace/DodgeRaceHUDinfo.cc

@@ -82 +82 @@
         if (this->getOwner() && this->getOwner()->getGametype())
         {
-            this->DodgeRaceGame = orxonox_cast<DodgeRace*>(this->getOwner()->getGametype().get());
+            this->DodgeRaceGame = orxonox_cast<DodgeRace*>(this->getOwner()->getGametype());
         }
         else

code/trunk/src/modules/dodgerace/DodgeRaceShip.cc

@@ -33 +33 @@
 
 #include "DodgeRaceShip.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox
@@ -89 +90 @@
 
         // Camera
-        WeakPtr<Camera> camera = this->getCamera();
+        Camera* camera = this->getCamera();
         if (camera != NULL)
         {
@@ -149 +150 @@
     }
 
-    WeakPtr<DodgeRace> DodgeRaceShip::getGame()
+    DodgeRace* DodgeRaceShip::getGame()
     {
         if (game == NULL)

code/trunk/src/modules/dodgerace/DodgeRaceShip.h

@@ -38 +38 @@
 #include "dodgerace/DodgeRacePrereqs.h"
 
-#include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "worldentities/pawns/SpaceShip.h"
@@ -79 +78 @@
         private:
             virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
-            WeakPtr<DodgeRace> getGame();
+            DodgeRace* getGame();
             WeakPtr<DodgeRace> game;
             WeakPtr<WorldEntity> lastEntity;