Changeset 9857 for code/branches/spacestationentry/src/modules/docking

Timestamp:

Dec 2, 2013, 4:05:10 PM (11 years ago)

Author:

agermann

Message:

Docking funktioniert nun mit einem eingebauten Trigger ueber undocking XMLPort. Jedoch immer noch mit cmdUndock(). Forcefield wurde um eine homogenes Kraftfeld erweitert, dass Kugelfoermig und mit einer bestimmten Richtung gemacht werden kann.

Location:

code/branches/spacestationentry/src/modules/docking

Files:

• Dock.cc (modified) (2 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);
-        //XMLPortEventSink(Dock, BaseObject, "undocking", undocking, xmlelement, mode);
+        XMLPortEventSink(Dock, BaseObject, "undocking", undocking, xmlelement, mode);
 
     }
@@ -79 +79 @@
         XMLPortEventSink(Dock, BaseObject, "execute", execute, xmlelement, mode);
 
-        //XMLPortEventSink(Dock, BaseObject, "undocking", undocking, xmlelement, mode);
-    }
-
-    /*
+        XMLPortEventSink(Dock, BaseObject, "undocking", undocking, xmlelement, mode);
+    }
+
+
     bool Dock::undocking(bool bTriggered, BaseObject* trigger)
     {
-        orxout(user_warning)<<"undocking"<<endl;
-
-        return true;
-    }
-
-    */
+        // Noch lange nicht fertig (leich veraenderte Kopie von execute())
+        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)
+                {
+                    cmdUndock();
+                }
+                else
+                {
+                    // Remove player from candidates list
+                    candidates_.erase(player);
+                }
+
+                return true;
+    }
+
+
 
     bool Dock::execute(bool bTriggered, BaseObject* trigger)

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

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