Changeset 4834 in orxonox.OLD for orxonox/trunk/src/util

Timestamp:

Jul 11, 2005, 5:47:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: crosshair in WeaponManager (instead of World) and implemented easy Cyling for LoadParam

Location:

orxonox/trunk/src/util

Files:

• loading/load_param.h (modified) (1 diff)
• track/track_manager.cc (modified) (2 diffs)
• track/track_manager.h (modified) (1 diff)

orxonox/trunk/src/util/loading/load_param.h

@@ -34 +34 @@
 //! macro that makes it even more easy to load a Parameter
 /**
-   \param className the name of the class to load
-   \param parameterName the name of the parameter to load as written in the XML-file
-   \param function the function to call
-*/
+ * @param className the name of the class to load
+ * @param parameterName the name of the parameter to load as written in the XML-file
+ * @param function the function to call
+ */
 #define LOAD_PARAM(className, parameterName, paramFunction) \
         LoadParam<className>(root, #parameterName, this, &className::paramFunction)
+
+/**
+ * this Starts a Cycle in the Loading Process
+ * be aware, that in the cycle the first parameter of load_param should because
+ * called element, and that you must say true at the Fith parameter, or it will fail
+ * also you will have to close the Cycle again with LOAD_PARAM_END_CYCLE
+ */
+#define LOAD_PARAM_START_CYCLE   const TiXmlElement* element; \
+                                 element = root->FirstChildElement(); \
+                                 while( element != NULL) \
+                                  {
+/**
+ * closes a LoadParam Loop
+ * @see LOAD_PARAM_START_CYCLE
+ */
+#define LOAD_PARAM_END_CYCLE        element = element->NextSiblingElement(); \
+                                  }
+
+
 
 /**

orxonox/trunk/src/util/track/track_manager.cc

@@ -394 +394 @@
    \param root the TiXmlElement to load the Data from
 */
-bool TrackManager::loadParams( TiXmlElement* root)
-{
-  TiXmlElement* element;
-  TiXmlNode* container;
+bool TrackManager::loadParams(const TiXmlElement* root)
+{
   double x, y, z, d;
 
-  element = root->FirstChildElement();
-  while( element != NULL)
-    {
+  LOAD_PARAM_START_CYCLE
+
       LoadParam<TrackManager>(element, "WorkOn", this, &TrackManager::workOnS, true)
         .describe("Selects a TrackElement (by name) to work on");
@@ -448 +445 @@
         }
       */
-      element = element->NextSiblingElement();
-    }
-
+      LOAD_PARAM_END_CYCLE;
 }
 

orxonox/trunk/src/util/track/track_manager.h

@@ -139 +139 @@
   inline static TrackManager* getInstance() { if (!singletonRef) singletonRef = new TrackManager();  return singletonRef; };
 
-  bool loadParams(TiXmlElement* root);
+  bool loadParams(const TiXmlElement* root);
 
   // Methods to change the Path (initialisation)