[Orxonox-commit 4581] r9252 - code/trunk/src/orxonox/controllers

[landauf at orxonox.net]

Author: landauf
Date: 2012-05-28 00:00:53 +0200 (Mon, 28 May 2012)
New Revision: 9252

Modified:
   code/trunk/src/orxonox/controllers/ArtificialController.cc
   code/trunk/src/orxonox/controllers/ArtificialController.h
   code/trunk/src/orxonox/controllers/WaypointController.cc
   code/trunk/src/orxonox/controllers/WaypointController.h
Log:
added missing call to RegisterObject (it crashed on windows)
moved XMLPort from WaypointController to ArtificialController

Modified: code/trunk/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/trunk/src/orxonox/controllers/ArtificialController.cc	2012-05-27 21:28:34 UTC (rev 9251)
+++ code/trunk/src/orxonox/controllers/ArtificialController.cc	2012-05-27 22:00:53 UTC (rev 9252)
@@ -23,11 +23,12 @@
  *      Fabian 'x3n' Landau
  *   Co-authors:
  *      Dominik Solenicki
- *      
+ *
  */
 
 #include "ArtificialController.h"
 #include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
 #include "core/command/ConsoleCommand.h"
 #include "worldentities/pawns/Pawn.h"
 #include "worldentities/pawns/SpaceShip.h"
@@ -45,6 +46,8 @@
 
     ArtificialController::ArtificialController(BaseObject* creator) : FormationController(creator)
     {
+        RegisterObject(ArtificialController);
+
         this->bSetupWorked = false;
         this->botlevel_ = 0.5f;
         this->timeout_ = 0;
@@ -63,7 +66,14 @@
         }
     }
 
+    void ArtificialController::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(ArtificialController, XMLPort, xmlelement, mode);
 
+        XMLPortParam(ArtificialController, "accuracy", setAccuracy, getAccuracy, xmlelement, mode).defaultValues(100.0f);
+        XMLPortObject(ArtificialController, WorldEntity, "waypoints", addWaypoint, getWaypoint,  xmlelement, mode);
+    }
+
     /**
         @brief Gets called when ControllableEntity is being changed. Resets the bot when it dies.
     */
@@ -275,5 +285,5 @@
         else
             this->updatePointsOfInterest("PickupSpawner", 20.0f); // take pickup en passant if there is a default waypoint
     }
- 
+
 }

Modified: code/trunk/src/orxonox/controllers/ArtificialController.h
===================================================================
--- code/trunk/src/orxonox/controllers/ArtificialController.h	2012-05-27 21:28:34 UTC (rev 9251)
+++ code/trunk/src/orxonox/controllers/ArtificialController.h	2012-05-27 22:00:53 UTC (rev 9252)
@@ -41,6 +41,8 @@
             ArtificialController(BaseObject* creator);
             virtual ~ArtificialController();
 
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+
             void abandonTarget(Pawn* target);
 
             virtual void changedControllableEntity();
@@ -61,10 +63,10 @@
             void updatePointsOfInterest(std::string name, float distance);
             void manageWaypoints();
 
-            
 
+
         protected:
-            
+
             void aimAtTarget();
 
             bool isCloseAtTarget(float distance) const;

Modified: code/trunk/src/orxonox/controllers/WaypointController.cc
===================================================================
--- code/trunk/src/orxonox/controllers/WaypointController.cc	2012-05-27 21:28:34 UTC (rev 9251)
+++ code/trunk/src/orxonox/controllers/WaypointController.cc	2012-05-27 22:00:53 UTC (rev 9252)
@@ -29,7 +29,6 @@
 #include "WaypointController.h"
 
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 #include "worldentities/ControllableEntity.h"
 
 namespace orxonox
@@ -51,14 +50,6 @@
         }
     }
 
-    void WaypointController::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(WaypointController, XMLPort, xmlelement, mode);
-
-        XMLPortParam(ArtificialController, "accuracy", setAccuracy, getAccuracy, xmlelement, mode).defaultValues(100.0f);
-        XMLPortObject(ArtificialController, WorldEntity, "waypoints", addWaypoint, getWaypoint,  xmlelement, mode);
-    }
-
     void WaypointController::tick(float dt)
     {
         if (!this->isActive())

Modified: code/trunk/src/orxonox/controllers/WaypointController.h
===================================================================
--- code/trunk/src/orxonox/controllers/WaypointController.h	2012-05-27 21:28:34 UTC (rev 9251)
+++ code/trunk/src/orxonox/controllers/WaypointController.h	2012-05-27 22:00:53 UTC (rev 9252)
@@ -43,7 +43,6 @@
             WaypointController(BaseObject* creator);
             virtual ~WaypointController();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void tick(float dt);
 
         protected: