Changeset 3049

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

Files:

• orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• orxonox/objects/controllers/AIController.cc (modified) (1 diff)
• orxonox/objects/controllers/ArtificialController.cc (modified) (6 diffs)
• orxonox/objects/controllers/ArtificialController.h (modified) (2 diffs)
• orxonox/objects/controllers/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/controllers/WaypointController.cc (added)
• orxonox/objects/controllers/WaypointController.h (added)
• orxonox/objects/controllers/WaypointPatrolController.cc (added)
• orxonox/objects/controllers/WaypointPatrolController.h (added)
• orxonox/objects/gametypes/TeamDeathmatch.cc (modified) (1 diff)
• orxonox/objects/gametypes/TeamDeathmatch.h (modified) (2 diffs)
• orxonox/objects/worldentities/ControllableEntity.cc (modified) (5 diffs)
• orxonox/objects/worldentities/ControllableEntity.h (modified) (3 diffs)
• util/Math.cc (modified) (2 diffs)

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -196 +196 @@
     class AIController;
     class ScriptController;
+    class WaypointController;
+    class WaypointPatrolController;
     class PongAI;
 

code/trunk/src/orxonox/objects/controllers/AIController.cc

@@ -108 +108 @@
 
         if (this->bHasTargetPosition_)
-            this->moveToTargetPosition(dt);
+            this->moveToTargetPosition();
 
-        if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(500) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
+        if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
             this->getControllableEntity()->fire(WeaponMode::fire);
 

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

@@ -34 +34 @@
 #include "objects/worldentities/pawns/Pawn.h"
 
+#include "objects/gametypes/TeamDeathmatch.h"
+#include "objects/controllers/WaypointPatrolController.h"
+
 namespace orxonox
 {
@@ -50 +53 @@
     }
 
-    void ArtificialController::moveToTargetPosition(float dt)
+    void ArtificialController::moveToPosition(const Vector3& target)
     {
         if (!this->getControllableEntity())
             return;
 
-        Vector2 coord = get2DViewdirection(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, this->targetPosition_);
-        float distance = (this->targetPosition_ - this->getControllableEntity()->getPosition()).length();
+        Vector2 coord = get2DViewdirection(this->getControllableEntity()->getPosition(), this->getControllableEntity()->getOrientation() * WorldEntity::FRONT, this->getControllableEntity()->getOrientation() * WorldEntity::UP, target);
+        float distance = (target - this->getControllableEntity()->getPosition()).length();
 
         if (this->target_ || distance > 10)
@@ -71 +74 @@
     }
 
+    void ArtificialController::moveToTargetPosition()
+    {
+        this->moveToPosition(this->targetPosition_);
+    }
+
+    void ArtificialController::setTargetPosition(const Vector3& target)
+    {
+        this->targetPosition_ = target;
+        this->bHasTargetPosition_ = true;
+    }
+
     void ArtificialController::searchRandomTargetPosition()
     {
@@ -77 +91 @@
     }
 
+    void ArtificialController::setTarget(Pawn* target)
+    {
+        this->target_ = target;
+
+        if (target)
+            this->targetPosition_ = target->getPosition();
+    }
+
     void ArtificialController::searchNewTarget()
     {
@@ -87 +109 @@
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
         {
-//            if (it->getTeamNr() != this->getTeamNr())
+            if (ArtificialController::sameTeam(this->getControllableEntity(), static_cast<ControllableEntity*>(*it), this->getGametype()))
+                continue;
+
             if (static_cast<ControllableEntity*>(*it) != this->getControllableEntity())
             {
@@ -147 +171 @@
         }
     }
+
+    bool ArtificialController::sameTeam(ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype)
+    {
+        if (entity1 == entity2)
+            return true;
+
+        int team1 = -1;
+        int team2 = -1;
+
+        if (entity1->getXMLController())
+        {
+            WaypointPatrolController* wpc = dynamic_cast<WaypointPatrolController*>(entity1->getXMLController());
+            if (wpc)
+                team1 = wpc->getTeam();
+        }
+        if (entity2->getXMLController())
+        {
+            WaypointPatrolController* wpc = dynamic_cast<WaypointPatrolController*>(entity2->getXMLController());
+            if (wpc)
+                team2 = wpc->getTeam();
+        }
+
+        TeamDeathmatch* tdm = dynamic_cast<TeamDeathmatch*>(gametype);
+        if (tdm)
+        {
+            if (entity1->getPlayer())
+                team1 = tdm->getTeam(entity1->getPlayer());
+
+            if (entity2->getPlayer())
+                team2 = tdm->getTeam(entity2->getPlayer());
+        }
+
+        return (team1 == team2 && team1 != -1);
+    }
 }

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

@@ -47 +47 @@
 
         protected:
-            void moveToTargetPosition(float dt);
+            void moveToPosition(const Vector3& target);
+            void moveToTargetPosition();
+
+            void setTargetPosition(const Vector3& target);
             void searchRandomTargetPosition();
+
+            void setTarget(Pawn* target);
             void searchNewTarget();
             void forgetTarget();
@@ -55 +60 @@
             bool isCloseAtTarget(float distance) const;
             bool isLookingAtTarget(float angle) const;
+
+            static bool sameTeam(ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype); // hack
 
             bool bHasTargetPosition_;

code/trunk/src/orxonox/objects/controllers/CMakeLists.txt

@@ -5 +5 @@
   AIController.cc
   ScriptController.cc
+  WaypointController.cc
+  WaypointPatrolController.cc
   PongAI.cc
 )

code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc

@@ -164 +164 @@
             if (pawn)
             {
+                pawn->setRadarObjectColour(this->teamcolours_[it_player->second]);
+
                 std::set<WorldEntity*> pawnAttachments = pawn->getAttachedObjects();
                 for (std::set<WorldEntity*>::iterator it = pawnAttachments.begin(); it != pawnAttachments.end(); ++it)

code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h

@@ -55 +55 @@
             virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
 
+            int getTeam(PlayerInfo* player);
+
             inline const ColourValue& getTeamColour(int teamnr) const
                 { return this->teamcolours_[teamnr]; }
@@ -61 +63 @@
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
             bool pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2);
-            int getTeam(PlayerInfo* player);
 
             std::map<PlayerInfo*, int> teamnumbers_;

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_;
     };
 }

code/trunk/src/util/Math.cc

@@ -129 +129 @@
 
         float projectionlength = projection.length();
-        if (projectionlength == 0) return orxonox::Vector2(0, 0);
+        if (projectionlength == 0)
+        {
+            if (myposition.dotProduct(otherposition) >= 0)
+                return orxonox::Vector2(0, 0);
+            else
+                return orxonox::Vector2(0, 1);
+        }
+
         float angle = acos(clamp<float>(myorthonormal.dotProduct(projection) / projectionlength, -1, 1));
 
@@ -161 +168 @@
 
         float projectionlength = projection.length();
-        if (projectionlength == 0) return orxonox::Vector2(0, 0);
+        if (projectionlength == 0)
+        {
+            if (myposition.dotProduct(otherposition) >= 0)
+                return orxonox::Vector2(0, 0);
+            else
+                return orxonox::Vector2(0, 1);
+        }
         float angle = acos(clamp<float>(myorthonormal.dotProduct(projection) / projectionlength, -1, 1));