Changeset 9789 for code/branches/spacestationentry/src/modules

Timestamp:

Nov 18, 2013, 4:05:55 PM (11 years ago)

Author:

agermann

Message:

Erstellung einer neuen Funktion execute2 in Dock.cc um ein Ausdocken zu realisieren.

Location:

code/branches/spacestationentry/src/modules/docking

Files:

• Dock.cc (modified) (4 diffs)
• Dock.h (modified) (1 diff)

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

@@ -69 +69 @@
         XMLPortObject(Dock, DockingAnimation, "animations", addAnimation, getAnimation, xmlelement, mode);
         XMLPortEventSink(Dock, BaseObject, "execute", execute, xmlelement, mode);
+
     }
 
@@ -76 +77 @@
 
         XMLPortEventSink(Dock, BaseObject, "execute", execute, xmlelement, mode);
+
+   //     XMLPortEventSink(Dock, BaseObject, "execute2", execute2, xmlelement, mode);
     }
 
@@ -120 +123 @@
     }
 
+    /*bool Dock::execute2(bool bTriggered, BaseObject* trigger)
+        {
+        orxout(user_warning)<<"execute2"<<endl;
+            PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
+            PlayerInfo* player = NULL;
+
+            // Check whether it is a player trigger and extract pawn from it
+            if(pTrigger != NULL)
+            {
+                if(!pTrigger->isForPlayer()) {  // The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
+                    orxout(verbose, context::docking) << "Docking:execute PlayerTrigger was not triggered by a player.." << endl;
+                    return false;
+                }
+                player = pTrigger->getTriggeringPlayer();
+            }
+            else
+            {
+                orxout(verbose, context::docking) << "Docking::execute Not a player trigger, can't extract pawn from it.." << endl;
+                return false;
+            }
+            if(player == NULL)
+            {
+                orxout(verbose, context::docking) << "Docking::execute Can't retrieve PlayerInfo from Trigger. (" << trigger->getIdentifier()->getName() << ")" << endl;
+                return false;
+            }
+
+            if(bTriggered)
+            {
+                // Add player to this Docks candidates
+                docked_.insert(player);
+
+                // Show docking dialog
+                this->showDockingDialogHelper(player);
+            }
+            else
+            {
+                // Remove player from candidates list
+                docked_.erase(player);
+            }
+
+            return true;
+        }
+
+*/
     void Dock::showDockingDialogHelper(PlayerInfo* player)
     {
@@ -177 +224 @@
         if (animations_.empty())
             return dockingAnimationFinished(player);
+
         else
             DockingAnimation::invokeAnimation(true, player, animations_);

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

@@ -62 +62 @@
             // Trigger interface
             bool execute(bool bTriggered, BaseObject* trigger);
+        //    bool execute2(bool bTriggered, BaseObject* trigger);
 
             // XML interface