Changeset 3049 for code/trunk/src/orxonox/objects/worldentities

Timestamp:

May 25, 2009, 3:26:43 AM (16 years ago)

Author:

landauf

Message:

• Added option to add a Controller to a ControllableEntity in the XML file
• Added two new classes: WaypointController (follows waypoints) and WaypointPatrolController (follows waypoints and kills enemies within a given radius)
• Radarpoints in TeamDeathmatch are now coloured

Location:

code/trunk/src/orxonox/objects/worldentities

Files:

• ControllableEntity.cc (modified) (5 diffs)
• ControllableEntity.h (modified) (3 diffs)

code/trunk/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -40 +40 @@
 #include "objects/Scene.h"
 #include "objects/infos/PlayerInfo.h"
+#include "objects/controllers/Controller.h"
 #include "objects/worldentities/Camera.h"
 #include "objects/worldentities/CameraPosition.h"
@@ -61 +62 @@
         this->hud_ = 0;
         this->camera_ = 0;
+        this->xmlcontroller_ = 0;
         this->bDestroyWhenPlayerLeft_ = false;
         this->cameraPositionRootNode_ = this->node_->createChildSceneNode();
@@ -93 +95 @@
                 this->getPlayer()->stopControl();
 
+            if (this->xmlcontroller_)
+                delete this->xmlcontroller_;
+
             if (this->hud_)
                 delete this->hud_;
@@ -115 +120 @@
 
         XMLPortObject(ControllableEntity, CameraPosition, "camerapositions", addCameraPosition, getCameraPosition, xmlelement, mode);
+        XMLPortObject(ControllableEntity, Controller,     "controller",      setXMLController,  getXMLController,  xmlelement, mode);
     }
 
@@ -304 +310 @@
     }
 
+    void ControllableEntity::setXMLController(Controller* controller)
+    {
+        if (!this->xmlcontroller_)
+        {
+            this->xmlcontroller_ = controller;
+            this->bHasLocalController_ = true;
+            this->xmlcontroller_->setControllableEntity(this);
+        }
+        else
+            COUT(2) << "Warning: ControllableEntity \"" << this->getName() << "\" already has a Controller." << std::endl;
+    }
+
     void ControllableEntity::parentChanged()
     {

code/trunk/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -130 +130 @@
                 { return this->mouseLookSpeed_; }
 
+            inline Controller* getXMLController() const
+                { return this->xmlcontroller_; }
+
         protected:
             virtual void setPlayer(PlayerInfo* player); // don't call this directly, use friend class PlayerInfo instead
@@ -142 +145 @@
 
         private:
+            void setXMLController(Controller* controller);
+
             void overwrite();
             void processOverwrite();
@@ -188 +193 @@
             std::list<CameraPosition*> cameraPositions_;
             std::string cameraPositionTemplate_;
+            Controller* xmlcontroller_;
     };
 }