Changeset 8457 for code/trunk/src/modules/portals

Timestamp:

May 12, 2011, 1:51:18 PM (14 years ago)

Author:

FelixSchulthess

Message:

merged portals branch into trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/portals (copied) (copied from code/branches/portals/src/modules/portals)
• src/modules/portals/CMakeLists.txt (copied) (copied from code/branches/portals/src/modules/portals/CMakeLists.txt)
• src/modules/portals/PortalEndPoint.cc (copied) (copied from code/branches/portals/src/modules/portals/PortalEndPoint.cc) (1 diff)
• src/modules/portals/PortalEndPoint.h (copied) (copied from code/branches/portals/src/modules/portals/PortalEndPoint.h) (1 diff)
• src/modules/portals/PortalLink.cc (copied) (copied from code/branches/portals/src/modules/portals/PortalLink.cc)
• src/modules/portals/PortalLink.h (copied) (copied from code/branches/portals/src/modules/portals/PortalLink.h)
• src/modules/portals/PortalsPrecompiledHeaders.h (copied) (copied from code/branches/portals/src/modules/portals/PortalsPrecompiledHeaders.h)
• src/modules/portals/PortalsPrereqs.h (copied) (copied from code/branches/portals/src/modules/portals/PortalsPrereqs.h)

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

@@ -33 +33 @@
         XMLPortParam(PortalEndPoint, "design", setTemplate, getTemplate, xmlelement, mode);
         XMLPortParamExtern(PortalEndPoint, DistanceMultiTrigger, this->trigger_, "distance", setDistance, getDistance, xmlelement, mode);
-        XMLPortParamLoadOnly(PortalEndPoint, "target", setTargets, xmlelement, mode).defaultValues("Pawn");
+        XMLPortParamLoadOnly(PortalEndPoint, "target", setTarget, xmlelement, mode).defaultValues("Pawn");
         
         // Add the DistanceMultiTrigger as event source.

code/trunk/src/modules/portals/PortalEndPoint.h

@@ -21 +21 @@
             virtual ~PortalEndPoint();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            inline void setTargets(const std::string & targets)                 //!< add types which are allowed to activate the PortalEndPoint
+            inline void setTarget(const std::string & target)                 //!< add types which are allowed to activate the PortalEndPoint
             {
-                this->trigger_->addTargets(targets);
+                this->trigger_->addTarget(target);
             }