Changeset 8454 for code/branches/portals/src/modules/portals/PortalEndPoint.cc

Timestamp:

May 12, 2011, 1:17:38 PM (13 years ago)

Author:

anbueche

Message:

comments added

File:

• code/branches/portals/src/modules/portals/PortalEndPoint.cc (modified) (4 diffs)

code/branches/portals/src/modules/portals/PortalEndPoint.cc

@@ -53 +53 @@
     bool PortalEndPoint::execute(bool bTriggered, BaseObject* trigger)
     {
+        if(!this->isActive())
+            return true;
+        
         MultiTriggerContainer * cont = orxonox_cast<MultiTriggerContainer *>(trigger);
         if(cont == 0)
@@ -64 +67 @@
         }
         
-        if(this->getAttachedObjects().find(orxonox_cast<WorldEntity *>(originatingTrigger)) == this->getAttachedObjects().end())  // only necessary if events have the same name
-            return true;
-        
         MobileEntity * entity = orxonox_cast<MobileEntity *>(cont->getData());
         if(entity == 0)
@@ -73 +73 @@
         if(bTriggered)
         {
-            if(this->recentlyJumpedOut_.find(entity) == this->recentlyJumpedOut_.end())  // only enter the portal if not recently jumped out of it
+            if(this->recentlyJumpedOut_.find(entity) == this->recentlyJumpedOut_.end())  // only enter the portal if not just jumped out of it
             {
                 PortalLink::use(entity, this);
@@ -89 +89 @@
     {
         this->recentlyJumpedOut_.insert(entity);
+        
         entity->setPosition(this->getWorldPosition());
         entity->rotate(this->getWorldOrientation());
         entity->setVelocity(this->getWorldOrientation() * entity->getVelocity());
+        entity->setVelocity(entity->getVelocity() * 1.5);
     }