Changeset 8185 for code/branches/dockingsystem/src/modules/docking/Dock.cc

Timestamp:

Apr 4, 2011, 3:12:49 PM (14 years ago)

Author:

sven

Message:

DockToShip and some fixes

File:

• code/branches/dockingsystem/src/modules/docking/Dock.cc (modified) (3 diffs)

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

@@ -37 +37 @@
 namespace orxonox
 {
-
-        CreateFactory(Dock);
+    CreateFactory(Dock);
 
     Dock::Dock(BaseObject* creator) : StaticEntity(creator)
     {
         RegisterObject(Dock);
-                COUT(0) << "Registering dock..." << std::endl;
+        COUT(0) << "Registering dock..." << std::endl;
     }
 
@@ -70 +69 @@
 
     bool Dock::execute(bool bTriggered, BaseObject* trigger)
-        {
-                COUT(0) << "Dock executed (bTriggered = " << (bTriggered? "true":"false") << ").." << std::endl;
-                return true;
-        }
+    {
+        COUT(0) << "Dock executed (bTriggered = " << (bTriggered? "true":"false") << ").." << std::endl;
+
+        //TODO: Handle MultiDistanceTrigger
+
+        //TODO: This way too oversimplified
+        if(bTriggered) {
+            DockingEffect::invokeEffect(docking::DOCKING, NULL, effects_);
+            DockingEffect::invokeEffect(docking::ATTACH, NULL, effects_);
+        } else {
+            DockingEffect::invokeEffect(docking::RELEASE, NULL, effects_);
+        }
 
 
-        bool Dock::addEffect(DockingEffect* effect) {
-                assert(effect);
-                effects_.push_back(effect);
-                return true;
-        }
-    
-        const DockingEffect* Dock::getEffect(unsigned int index) const {
-                int i = index;
+        return true;
+    }
+
+
+    bool Dock::addEffect(DockingEffect* effect) {
+        assert(effect);
+        effects_.push_back(effect);
+        return true;
+    }
+
+    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)
         {
@@ -92 +103 @@
         }
         return NULL;
-        }
-
+    }
 }