[Orxonox-commit 4730] r9399 - code/branches/Racingbot/src/modules/gametypes

[purgham at orxonox.net]

Author: purgham
Date: 2012-10-15 16:21:44 +0200 (Mon, 15 Oct 2012)
New Revision: 9399

Added:
   code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc
   code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h
Modified:
   code/branches/Racingbot/src/modules/gametypes/CMakeLists.txt
   code/branches/Racingbot/src/modules/gametypes/GametypesPrereqs.h
   code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc
   code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.h
Log:
Created new SpaceRaceController and added a function to SpaceRaceManager

Modified: code/branches/Racingbot/src/modules/gametypes/CMakeLists.txt
===================================================================
--- code/branches/Racingbot/src/modules/gametypes/CMakeLists.txt	2012-10-15 14:19:51 UTC (rev 9398)
+++ code/branches/Racingbot/src/modules/gametypes/CMakeLists.txt	2012-10-15 14:21:44 UTC (rev 9399)
@@ -4,6 +4,7 @@
   SpaceRaceManager.cc
   OldSpaceRace.cc
   OldRaceCheckPoint.cc
+  SpaceRaceController.cc
 )
 
 ORXONOX_ADD_LIBRARY(gametypes

Modified: code/branches/Racingbot/src/modules/gametypes/GametypesPrereqs.h
===================================================================
--- code/branches/Racingbot/src/modules/gametypes/GametypesPrereqs.h	2012-10-15 14:19:51 UTC (rev 9398)
+++ code/branches/Racingbot/src/modules/gametypes/GametypesPrereqs.h	2012-10-15 14:21:44 UTC (rev 9399)
@@ -66,6 +66,7 @@
 {
     class SpaceRace;
     class OldSpaceRace;
+    class SpaceRaceController;
 }
 
 #endif /* _GametypesPrereqs_H__ */

Added: code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc
===================================================================
--- code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc	                        (rev 0)
+++ code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc	2012-10-15 14:21:44 UTC (rev 9399)
@@ -0,0 +1,49 @@
+/*
+ * SpaceRaceController.cc
+ *
+ *  Created on: Oct 8, 2012
+ *      Author: purgham
+ */
+
+#include <gametypes/SpaceRaceController.h>
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+
+
+// Von SpaceRaceManager points einlesen
+// Berechnungsklasse nextPoint zur verfuegung stellen
+// ^- aufrufen ueber tick (if ob noetig)
+namespace orxonox
+{
+
+SpaceRaceController::SpaceRaceController(BaseObject* creator): ArtificialController(creator)
+{
+
+    std::vector<RaceCheckPoint*> wayOptions = NULL;
+    std::vector<RaceCheckPoint*> wayChosen = new std::vector<RaceCheckPoint*>();
+    // TODO Auto-generated constructor stub
+    for (ObjectList<SpaceRaceManager >::iterator it = ObjectList<SpaceRaceManager>::begin(); it != ObjectList<SpaceRaceManager>::end(); ++it)
+        wayOptions=it->getAllCheckpoints();
+
+
+}
+
+SpaceRaceController::~SpaceRaceController()
+{
+    // TODO Auto-generated destructor stub
+}
+
+void SpaceRaceController::XMLPort(Element& xmlelement, XMLPort::Mode mode){
+            SUPER(SpaceRaceController, XMLPort, xmlelement, mode);
+
+            XMLPortParam(ArtificialController, "accuracy", setAccuracy, getAccuracy, xmlelement, mode).defaultValues(100.0f);
+            XMLPortObject(ArtificialController, WorldEntity, "waypoints", addWaypoint, getWaypoint,  xmlelement, mode);
+
+}
+void SpaceRaceController::tick(float dt){
+
+}
+
+
+
+}

Added: code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h
===================================================================
--- code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h	                        (rev 0)
+++ code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.h	2012-10-15 14:21:44 UTC (rev 9399)
@@ -0,0 +1,34 @@
+/*
+ * SpaceRaceController.h
+ *
+ *  Created on: Oct 8, 2012
+ *      Author: purgham
+ */
+
+#ifndef SPACERACECONTROLLER_H_
+#define SPACERACECONTROLLER_H_
+
+#include "gametypes/GametypesPrereqs.h"
+#include "controllers/ArtificialController.h"
+#include "gametypes/Gametype.h"
+
+
+
+namespace orxonox
+{
+    class _GametypesExport SpaceRaceController : public ArtificialController, public Tickable
+    {
+        private:
+            vector<RaceCheckPoint*> lastRaceCheckpoint;
+            vector<RaceCheckPoint*> nextRaceCheckpoint;
+        public:
+          SpaceRaceController(BaseObject* creator);
+          virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+          virtual ~SpaceRaceController();
+          virtual void tick(float dt);
+    };
+
+}
+
+
+#endif /* SPACERACECONTROLLER_H_ */

Modified: code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc
===================================================================
--- code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc	2012-10-15 14:19:51 UTC (rev 9398)
+++ code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.cc	2012-10-15 14:21:44 UTC (rev 9399)
@@ -93,6 +93,10 @@
             return 0;
     }
 
+    std::vector<RaceCheckPoint*> SpaceRaceManager::getAllCheckpoints(){
+        return checkpoints_;
+    }
+
     /**
         @brief Returns the checkpoint with the given checkpoint-index (@see RaceCheckPoint::getCheckpointIndex).
     */

Modified: code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.h
===================================================================
--- code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.h	2012-10-15 14:19:51 UTC (rev 9398)
+++ code/branches/Racingbot/src/modules/gametypes/SpaceRaceManager.h	2012-10-15 14:21:44 UTC (rev 9399)
@@ -66,6 +66,8 @@
 
             void checkpointReached(RaceCheckPoint* newCheckpoint, PlayerInfo* player);
 
+            std::vector<RaceCheckPoint*> getAllCheckpoints();
+
             void tick(float dt);
 
         protected: