Changeset 5654 in orxonox.OLD for trunk/src/util/track

Timestamp:

Nov 20, 2005, 9:12:50 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: cycle-loading of LoadParam works…

File:

• trunk/src/util/track/track_manager.cc (modified) (2 diffs)

trunk/src/util/track/track_manager.cc

@@ -398 +398 @@
   double x, y, z, d;
 
-  LOAD_PARAM_START_CYCLE(root, element)
-
-      LoadParam<TrackManager>(element, "WorkOn", this, &TrackManager::workOnS, true)
+  LOAD_PARAM_START_CYCLE(root, element);
+  {
+
+    LoadParam_CYCLE(element, "WorkOn", this, TrackManager, workOnS)
         .describe("Selects a TrackElement (by name) to work on");
 
-      LoadParam<TrackManager>(element, "Point", this, &TrackManager::addPoint, true)
+    LoadParam_CYCLE(element, "Point", this, TrackManager, addPoint)
         .describe("Adds a new Point to the currently selected TrackElement");
 
-      LoadParam<TrackManager>(element, "Duration", this, &TrackManager::setDuration, true)
+    LoadParam_CYCLE(element, "Duration", this, TrackManager, setDuration)
         .describe("Sets the Duration of the currently selected TrackElement");
 
-      LoadParam<TrackManager>(element, "HotPoint", this, &TrackManager::addHotPoint, true)
+    LoadParam_CYCLE(element, "HotPoint", this, TrackManager, addHotPoint)
         .describe("Sets a new Point that acts as a hot point. meaning, the curve will flow through this Point");
 
-      LoadParam<TrackManager>(element, "SavePoint", this, &TrackManager::setSavePointS, true)
+    LoadParam_CYCLE(element, "SavePoint", this, TrackManager, setSavePointS)
         .describe("Sets the current selected Point to a Savepoint, meaning that the curve will be ended and a new one starts, and that one starts again from this point on");
 
-      LoadParam<TrackManager>(element, "Fork", this, &TrackManager::forkS, true)
+    LoadParam_CYCLE(element, "Fork", this, TrackManager, forkS)
         .describe("Forks the Path into multiple forked Path names seperated by ','");
 
-      LoadParam<TrackManager>(element, "Join", this, &TrackManager::joinS, true)
+    LoadParam_CYCLE(element, "Join", this, TrackManager, joinS)
         .describe("Joins multiple joining Path names seperated by ','");
 
       /*
-        if( !strcmp( element->Value(), "Fork"))
-        {
-        container = element->FirstChild();
-        if( container->ToText())
+    if( !strcmp( element->Value(), "Fork"))
+    {
+    container = element->FirstChild();
+    if( container->ToText())
         {
         assert( container->Value() != NULL);
@@ -445 +446 @@
         }
       */
-      LOAD_PARAM_END_CYCLE(element);
+  }
+  LOAD_PARAM_END_CYCLE(element);
 }