Changeset 9252 for code/trunk

Timestamp:

May 28, 2012, 12:00:53 AM (12 years ago)

Author:

landauf

Message:

added missing call to RegisterObject (it crashed on windows)
moved XMLPort from WaypointController to ArtificialController

Location:

code/trunk/src/orxonox/controllers

Files:

• ArtificialController.cc (modified) (4 diffs)
• ArtificialController.h (modified) (2 diffs)
• WaypointController.cc (modified) (2 diffs)
• WaypointController.h (modified) (1 diff)

code/trunk/src/orxonox/controllers/ArtificialController.cc

@@ -24 +24 @@
  *   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"
@@ -46 +47 @@
     ArtificialController::ArtificialController(BaseObject* creator) : FormationController(creator)
     {
+        RegisterObject(ArtificialController);
+
         this->bSetupWorked = false;
         this->botlevel_ = 0.5f;
@@ -64 +67 @@
     }
 
+    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);
+    }
 
     /**
@@ -276 +286 @@
             this->updatePointsOfInterest("PickupSpawner", 20.0f); // take pickup en passant if there is a default waypoint
     }
- 
+
 }

code/trunk/src/orxonox/controllers/ArtificialController.h

@@ -42 +42 @@
             virtual ~ArtificialController();
 
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+
             void abandonTarget(Pawn* target);
 
@@ -62 +64 @@
             void manageWaypoints();
 
-            
+
 
         protected:
-            
+
             void aimAtTarget();
 

code/trunk/src/orxonox/controllers/WaypointController.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 #include "worldentities/ControllableEntity.h"
 
@@ -52 +51 @@
     }
 
-    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)
     {

code/trunk/src/orxonox/controllers/WaypointController.h

@@ -44 +44 @@
             virtual ~WaypointController();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             virtual void tick(float dt);