Changeset 8382 for code/branches/dockingsystem2/src

Timestamp:

May 2, 2011, 4:16:27 PM (13 years ago)

Author:

sven

Message:

Added dock/undock console commands.

Location:

code/branches/dockingsystem2/src

Files:

• modules/docking/Dock.cc (modified) (7 diffs)
• modules/docking/Dock.h (modified) (3 diffs)
• modules/docking/DockToShip.cc (modified) (2 diffs)
• orxonox/infos/PlayerInfo.cc (modified) (1 diff)

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

@@ -33 +33 @@
 
 #include "Dock.h"
+
 #include "infos/HumanPlayer.h"
 #include "worldentities/pawns/Pawn.h"
 #include "interfaces/PlayerTrigger.h"
+#include "controllers/HumanController.h"
+#include "core/command/ConsoleCommand.h"
+
 
 
@@ -41 +45 @@
 {
     CreateFactory(Dock);
+
+    SetConsoleCommand("Dock", "dock",    &Dock::cmdDock).addShortcut().setAsInputCommand();
+    SetConsoleCommand("Dock", "undock",  &Dock::cmdUndock).addShortcut().setAsInputCommand();
 
     Dock::Dock(BaseObject* creator) : StaticEntity(creator)
@@ -80 +87 @@
         {
             if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
-                COUT(0) << "Docking:execute PlayerTrigger was not triggered by a player.." << std::endl;
+                COUT(2) << "Docking:execute PlayerTrigger was not triggered by a player.." << std::endl;
                 return false;
             }
             pawn = pTrigger->getTriggeringPlayer();
         } else {
-            COUT(0) << "Docking::execute Not a player trigger, can't extract pawn from it.." << std::endl;
+            COUT(2) << "Docking::execute Not a player trigger, can't extract pawn from it.." << std::endl;
             return false;
         }
         if(pawn == NULL)
         {
-            COUT(0) << "Docking::execute Can't retrieve Pawn from Trigger. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
+            COUT(2) << "Docking::execute Can't retrieve Pawn from Trigger. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
             return false;
         }
@@ -98 +105 @@
         if(player == NULL)
         {
-            COUT(0) << "The PlayerInfo* is NULL." << std::endl;
+            COUT(2) << "The PlayerInfo* is NULL." << std::endl;
             return false;
         }
@@ -105 +112 @@
 
         if(bTriggered) {
-            DockingEffect::invokeEffect(docking::DOCKING, player, effects_);
-            DockingEffect::invokeEffect(docking::ATTACH, player, effects_);
+            // Add player to this Docks candidates
+            candidates.insert(player);
+
+            //DockingEffect::invokeEffect(docking::DOCKING, player, effects_);
         } else {
-            DockingEffect::invokeEffect(docking::RELEASE, player, effects_);
+            // Remove player from candidates list
+            candidates.erase(player);
+
+            //DockingEffect::invokeEffect(docking::RELEASE, player, effects_);
         }
 
@@ -115 +127 @@
 
 
+    void Dock::cmdDock() {
+        PlayerInfo* player = HumanController::getLocalControllerSingleton()->getPlayer();
+        for(ObjectList<Dock>::iterator it = ObjectList<Dock>::begin(); it != ObjectList<Dock>::end(); ++it) {
+            if(it->dock(player))
+                break;
+        }
+    }
+
+    void Dock::cmdUndock() {
+        PlayerInfo* player = HumanController::getLocalControllerSingleton()->getPlayer();
+        for(ObjectList<Dock>::iterator it = ObjectList<Dock>::begin(); it != ObjectList<Dock>::end(); ++it) {
+            if(it->undock(player))
+                break;
+        }
+    }
+
+
+    bool Dock::dock(PlayerInfo* player) {
+        // Check if player is a candidate
+        if(candidates.find(player) == candidates.end()) {
+            COUT(0) << "Player is not a candidate!";
+            return false;
+        }
+
+        // Remove player from candidates, add to docked players and invoke docking effect
+        candidates.erase(player);
+        docked.insert(player);
+        DockingEffect::invokeEffect(docking::ATTACH, player, effects);
+        return true;
+    }
+
+    bool Dock::undock(PlayerInfo* player) {
+        // Check if player is docked to this Dock
+        if(docked.find(player) == docked.end()) {
+            COUT(0) << "Player is not docked to this Dock." << std::endl;
+            return false;
+        }
+
+        // Remove player from docked, add to candidates and reverse DockingEffect 
+        docked.erase(player);
+        candidates.insert(player);
+        DockingEffect::invokeEffect(docking::RELEASE, player, effects);
+        return true;
+    }
+
+
     bool Dock::addEffect(DockingEffect* effect) {
         assert(effect);
-        effects_.push_back(effect);
+        effects.push_back(effect);
         return true;
     }
@@ -123 +181 @@
     const DockingEffect* Dock::getEffect(unsigned int index) const {
         int i = index;
-        for (std::list<DockingEffect*>::const_iterator effect = this->effects_.begin(); effect != this->effects_.end(); ++effect)
-        {
+        for (std::list<DockingEffect*>::const_iterator effect = this->effects.begin(); effect != this->effects.end(); ++effect) {
             if(i == 0)
                return *effect;
-
             i--;
         }

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

@@ -36 +36 @@
 #define _Dock_H__
 
+#include <map>
+
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -41 +43 @@
 
 #include "worldentities/StaticEntity.h"
+#include "notifications/NotificationManager.h"
+
 #include "DockingEffect.h"
 #include "DockingPrereqs.h"
 
-namespace orxonox { 
-
+namespace orxonox {
 
     class _DockingExport Dock : public StaticEntity {
@@ -60 +63 @@
         const DockingEffect* getEffect(unsigned int index) const; //!< Get the DockingEffect at a given index.
 
+        bool dock(PlayerInfo* player); //!< Returns true if given player docked successfully (player must be a candidate)
+        bool undock(PlayerInfo* player); //!< Undocks a player (player must be docked)
+
+        static void cmdDock();
+        static void cmdUndock();
+
     private:
-        std::list<DockingEffect*> effects_; //!< The list of DockingEffects to be executed when a player docks.
+        std::set<PlayerInfo*> candidates; //!< A set of all players which are allowed to dock using the console command.
+        std::set<PlayerInfo*> docked; //!< A set of all docked players
+        std::list<DockingEffect*> effects; //!< The list of DockingEffects to be executed when a player docks.
     };
 

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

@@ -89 +89 @@
         }
 
+        // Make sure target isn't removed when undocking
+        dockTo->setDestroyWhenPlayerLeft(false);
         player->startTemporaryControl(dockTo);
 
@@ -97 +99 @@
     {
         COUT(0) << "DockToShip::release" << endl;
+
+        player->stopTemporaryControl();
+
         return true;
     }

code/branches/dockingsystem2/src/orxonox/infos/PlayerInfo.cc

@@ -223 +223 @@
         this->controllableEntity_->setController(0);
         
-        this->controllableEntity_ = this->previousControllableEntity_.back();
+//        this->controllableEntity_ = this->previousControllableEntity_.back();
         do {
             this->controllableEntity_ = this->previousControllableEntity_.back();