Changeset 8257 for code/branches/dockingsystem2/src

Timestamp:

Apr 18, 2011, 4:35:01 PM (13 years ago)

Author:

sven

Message:

First working dock example..

Location:

code/branches/dockingsystem2/src/modules/docking

Files:

• CMakeLists.txt (modified) (1 diff)
• Dock.cc (modified) (2 diffs)
• DockToShip.cc (modified) (2 diffs)
• DockToShip.h (modified) (2 diffs)
• DockingEffect.cc (modified) (2 diffs)
• DockingEffect.h (modified) (2 diffs)
• DockingPrereqs.h (modified) (1 diff)
• DockingTarget.cc (added)
• DockingTarget.h (added)

code/branches/dockingsystem2/src/modules/docking/CMakeLists.txt

@@ -1 +1 @@
 SET_SOURCE_FILES(DOCKING_SRC_FILES
+  DockingTarget.cc
   DockingEffect.cc
   DockToShip.cc

code/branches/dockingsystem2/src/modules/docking/Dock.cc

@@ -73 +73 @@
     bool Dock::execute(bool bTriggered, BaseObject* trigger)
     {
-        //TODO: Handle DistanceMultiTrigger
-
         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
         Pawn* pawn = NULL;
@@ -104 +102 @@
         }
 
-        // Try to get HumanPlayer
-        if(!player->isHumanPlayer()) {
-            COUT(0) << "Docking::execute Not triggered by a human." << std::endl;
-            return false;
-        }
-        HumanPlayer* human = orxonox_cast<HumanPlayer*>(player);
-        if(human == NULL) {
-            COUT(0) << "Docking::execute Player was not as human as expected.." << std::endl;
-        }
-        COUT(0) << "Dock triggered by player: " << human->getName() << ".." << std::endl;
+        COUT(0) << "Dock triggered by player: " << player->getName() << ".." << std::endl;
 
-        //TODO: This is waaay too oversimplified
         if(bTriggered) {
             DockingEffect::invokeEffect(docking::DOCKING, player, effects_);
-            //DockingEffect::invokeEffect(docking::ATTACH, player, effects_);
+            DockingEffect::invokeEffect(docking::ATTACH, player, effects_);
         } else {
             DockingEffect::invokeEffect(docking::RELEASE, player, effects_);

code/branches/dockingsystem2/src/modules/docking/DockToShip.cc

@@ -51 +51 @@
     }
 
+
+    void DockToShip::XMLPort(Element& xmlelement, XMLPort::Mode mode) {
+        SUPER(DockToShip, XMLPort, xmlelement, mode);
+
+        XMLPortParam(DockToShip, "target", setTargetId, getTargetId, xmlelement, mode);
+    }
+
+    void DockToShip::setTargetId(std::string str) {
+        this->target = str;
+    }
+
+    std::string DockToShip::getTargetId() {
+        return this->target;
+    }
+
+
     bool DockToShip::docking(PlayerInfo* player)
     {
@@ -60 +76 @@
     {
         COUT(0) << "DockToShip::attach" << endl;
+
+        DockingTarget *target = DockingEffect::findTarget(this->target);
+        if (target == NULL) {
+            COUT(0) << "Can't retrieve target for '" << this->target << "'.." << std::endl;
+            return false;
+        }
+
+        ControllableEntity *dockTo = (ControllableEntity*) target->getParent();
+        if (dockTo == NULL) {
+            COUT(0) << "Parent is not a ControllableEntity.." << std::endl;
+            return false;
+        }
+
+        player->startTemporaryControl(dockTo);
+
         return true;
     }

code/branches/dockingsystem2/src/modules/docking/DockToShip.h

@@ -39 +39 @@
 #include "DockToShip.h"
 
+#include "worldentities/ControllableEntity.h"
+
 
 namespace orxonox
@@ -58 +60 @@
             virtual ~DockToShip();
 
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void setTargetId(std::string str);
+            virtual std::string getTargetId();
+
             virtual bool docking(PlayerInfo* player); //!< Called when docking starts
             virtual bool attach(PlayerInfo* player); //!< Called after docking animation
             virtual bool release(PlayerInfo* player); //!< Called when player wants undock
+
+        private:
+            std::string target;
     };
 

code/branches/dockingsystem2/src/modules/docking/DockingEffect.cc

@@ -33 +33 @@
 
 #include "DockingEffect.h"
-#include "core/CoreIncludes.h"
 
 namespace orxonox
@@ -71 +70 @@
         return check;
     }
+
+    DockingTarget *DockingEffect::findTarget(std::string name) {
+        for (ObjectList<DockingTarget>::iterator it = ObjectList<DockingTarget>::begin();
+                                 it != ObjectList<DockingTarget>::end(); ++it)
+        {
+            if ((*it)->getName().compare(name) == 0)
+                return (*it);
+        }
+        return NULL;
+    }
 }

code/branches/dockingsystem2/src/modules/docking/DockingEffect.h

@@ -36 +36 @@
 #define _DockingEffect_H__
 
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+
+#include "infos/PlayerInfo.h"
+
 #include "DockingPrereqs.h"
+#include "DockingTarget.h"
 
 #include <list>
@@ -68 +74 @@
             virtual bool docking(PlayerInfo* player) = 0; //!< Called when docking starts
             virtual bool attach(PlayerInfo* player) = 0; //!< Called after docking animation
-            virtual bool release(PlayerInfo* player) = 0; //!< Called when player wants undock
+            virtual bool release(PlayerInfo* player) = 0; //!< Called when player wants to undock
 
             static bool invokeEffect(docking::event event, PlayerInfo* player, std::list<DockingEffect*> & effects); //!< Invokes the event specific method of all DockingEffects in the list
+            static DockingTarget *findTarget(std::string name); //!< Iterates through all DockingTarget objects to find the one with name=target
     };
 

code/branches/dockingsystem2/src/modules/docking/DockingPrereqs.h

@@ -66 +66 @@
 {
     class Dock;
+    class DockingTarget;
     class DockingEffect;
     class DockToShip;