Changeset 8493 for code/branches/dockingsystem2/src/modules/docking/Dock.cc

Timestamp:

May 16, 2011, 6:21:05 PM (14 years ago)

Author:

sven

Message:

Added docking animations, skeletton for DockingController..

File:

• code/branches/dockingsystem2/src/modules/docking/Dock.cc (modified) (10 diffs)

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

@@ -57 +57 @@
     {
         RegisterObject(Dock);
-        COUT(0) << "Registering dock..." << std::endl;
     }
 
@@ -70 +69 @@
 
         XMLPortObject(Dock, DockingEffect, "effects", addEffect, getEffect, xmlelement, mode);
+        XMLPortObject(Dock, DockingAnimation, "animations", addAnimation, getAnimation, xmlelement, mode);
         XMLPortEventSink(Dock, BaseObject, "execute", execute, xmlelement, mode);
-
-        COUT(0) << "Dock created.." << std::endl;
     }
 
@@ -96 +94 @@
             }
             pawn = pTrigger->getTriggeringPlayer();
-        } else {
+        }
+        else
+        {
             COUT(2) << "Docking::execute Not a player trigger, can't extract pawn from it.." << std::endl;
             return false;
@@ -110 +110 @@
         if(player == NULL)
         {
-            COUT(2) << "The PlayerInfo* is NULL." << std::endl;
-            return false;
-        }
-
-        COUT(0) << "Dock triggered by player: " << player->getName() << ".." << std::endl;
+            COUT(2) << "Docking::execute The PlayerInfo* is NULL." << std::endl;
+            return false;
+        }
 
         if(bTriggered)
@@ -123 +121 @@
             // Show docking dialog
             GUIManager::showGUI("DockingDialog");
-            //DockingEffect::invokeEffect(docking::DOCKING, player, effects_);
         }
         else
@@ -129 +126 @@
             // Remove player from candidates list
             candidates.erase(player);
-
-            //DockingEffect::invokeEffect(docking::RELEASE, player, effects_);
         }
 
@@ -163 +158 @@
         if(candidates.find(player) == candidates.end())
         {
-            COUT(0) << "Player is not a candidate!" << std::endl;
-            return false;
-        }
-
-        // Remove player from candidates, add to docked players and invoke docking effect
+            COUT(0) << "Dock::dock Player is not a candidate!" << std::endl;
+            return false;
+        }
+
         candidates.erase(player);
         docked.insert(player);
-        DockingEffect::invokeEffect(docking::ATTACH, player, effects);
+
+        if (animations.empty())
+            return dockingAnimationFinished(player);
+        else
+            DockingAnimation::invokeAnimation(true, player, animations);
+
+        return true;
+    }
+
+    bool Dock::dockingAnimationFinished(PlayerInfo* player)
+    {
+        if(docked.find(player) == docked.end())
+        {
+            COUT(0) << "Dock::dockingAnimationFinished Player is not currently docked." << std::endl;
+            return false;
+        }
+
+        DockingEffect::invokeEffect(true, player, effects);
         return true;
     }
@@ -179 +190 @@
         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 
+            COUT(0) << "Dock::undock Player is not docked to this Dock." << std::endl;
+            return false;
+        }
+
         docked.erase(player);
         candidates.insert(player);
-        DockingEffect::invokeEffect(docking::RELEASE, player, effects);
+
+        DockingEffect::invokeEffect(false, player, effects);
+
+        if (animations.empty())
+            return undockingAnimationFinished(player);
+        else
+            DockingAnimation::invokeAnimation(false, player, animations);
+
+        return true;
+    }
+
+    bool Dock::undockingAnimationFinished(PlayerInfo* player) {
+        COUT(0) << "Dock::undockingAnimationFinished executed" << std::endl;
         return true;
     }
@@ -226 +248 @@
     }
 
-    const DockingEffect* Dock::getEffect(unsigned int index) const
-    {
-        int i = index;
+    const DockingEffect* Dock::getEffect(unsigned int i) const
+    {
         for (std::list<DockingEffect*>::const_iterator effect = this->effects.begin(); effect != this->effects.end(); ++effect)
         {
@@ -237 +258 @@
         return NULL;
     }
+
+    bool Dock::addAnimation(DockingAnimation* animation)
+    {
+        assert(animation);
+        animation->setParent(this);
+        animations.push_back(animation);
+        return true;
+    }
+
+    const DockingAnimation* Dock::getAnimation(unsigned int i) const
+    {
+        for (std::list<DockingAnimation*>::const_iterator animation = this->animations.begin(); animation != this->animations.end(); ++animation)
+        {
+            if(i == 0)
+               return *animation;
+            i--;
+        }
+        return NULL;
+    }
 }