[Orxonox-commit 3775] r8455 - code/branches/portals/src/modules/portals

anbueche at orxonox.net anbueche at orxonox.net
Thu May 12 13:22:56 CEST 2011


Author: anbueche
Date: 2011-05-12 13:22:55 +0200 (Thu, 12 May 2011)
New Revision: 8455

Modified:
   code/branches/portals/src/modules/portals/PortalEndPoint.h
   code/branches/portals/src/modules/portals/PortalLink.cc
   code/branches/portals/src/modules/portals/PortalLink.h
Log:
comments added

Modified: code/branches/portals/src/modules/portals/PortalEndPoint.h
===================================================================
--- code/branches/portals/src/modules/portals/PortalEndPoint.h	2011-05-12 11:17:38 UTC (rev 8454)
+++ code/branches/portals/src/modules/portals/PortalEndPoint.h	2011-05-12 11:22:55 UTC (rev 8455)
@@ -20,7 +20,7 @@
             PortalEndPoint(BaseObject* creator);
             virtual ~PortalEndPoint();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            inline void setTargets(const std::string & targets)                 //!< set types which are allowed to activate the PortalEndPoint 
+            inline void setTargets(const std::string & targets)                 //!< add types which are allowed to activate the PortalEndPoint
             {
                 this->trigger_->addTargets(targets);
             }

Modified: code/branches/portals/src/modules/portals/PortalLink.cc
===================================================================
--- code/branches/portals/src/modules/portals/PortalLink.cc	2011-05-12 11:17:38 UTC (rev 8454)
+++ code/branches/portals/src/modules/portals/PortalLink.cc	2011-05-12 11:22:55 UTC (rev 8455)
@@ -31,11 +31,6 @@
             PortalLink::links_s[from] = to;
         }
     }
-    
-    void PortalLink::tick(float dt)
-    {
-        SUPER(PortalLink, tick, dt);
-    }
 
     void PortalLink::use(MobileEntity* entity, PortalEndPoint * entrance)
     {

Modified: code/branches/portals/src/modules/portals/PortalLink.h
===================================================================
--- code/branches/portals/src/modules/portals/PortalLink.h	2011-05-12 11:17:38 UTC (rev 8454)
+++ code/branches/portals/src/modules/portals/PortalLink.h	2011-05-12 11:22:55 UTC (rev 8455)
@@ -16,10 +16,8 @@
         public:
             PortalLink(BaseObject* creator);
             virtual ~PortalLink();
-    
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void tick(float dt);
-            inline void setFromID(unsigned int from)
+            inline void setFromID(unsigned int from)    //!< set the ID of the PortalEndPoint which should act as the entrance of this link
             {
                 this->fromID_ = from;
             }
@@ -27,7 +25,7 @@
             {
                 return this->fromID_;
             }
-            inline void setToID(unsigned int to)
+            inline void setToID(unsigned int to)     //!< set the ID of the PortalEndPoint which should act as the exit of this link
             {
                 this->toID_ = to;
             }
@@ -35,7 +33,7 @@
             {
                 return this->toID_;
             }
-            static void use(MobileEntity * entity, PortalEndPoint * entrance);
+            static void use(MobileEntity * entity, PortalEndPoint * entrance);   //
         protected:
         private:
             static std::map<PortalEndPoint *, PortalEndPoint *> links_s;




More information about the Orxonox-commit mailing list