Changeset 5654 in orxonox.OLD for trunk/src/lib

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: cycle-loading of LoadParam works…

Location:

trunk/src/lib

Files:

• coord/p_node.cc (modified) (1 diff)
• graphics/render2D/element_2d.cc (modified) (1 diff)
• particles/particle_engine.cc (modified) (1 diff)
• particles/particle_system.cc (modified) (2 diffs)

trunk/src/lib/coord/p_node.cc

@@ -162 +162 @@
   if (root != NULL)
   {
-    const TiXmlElement* element = root->FirstChildElement();
-    while (element != NULL)
+    LOAD_PARAM_START_CYCLE(root, element);
     {
-      LoadParam<PNode>(element, "parent", this, &PNode::addChild, true)
+      LoadParam_CYCLE(element, "parent", this, PNode, addChild)
           .describe("adds a new Child to the current Node.");
 
-      element = element->NextSiblingElement();
     }
+    LOAD_PARAM_END_CYCLE(element);
   }
 }

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -165 +165 @@
   if (root != NULL)
   {
-    const TiXmlElement* element = root->FirstChildElement();
-    while (element != NULL)
-    {
-      LoadParam<Element2D>(root, "parent", this, &Element2D::addChild2D, true)
+    LOAD_PARAM_START_CYCLE(root, element);
+    {
+      LoadParam_CYCLE(element, "parent", this, Element2D, addChild2D)
           .describe("adds a new Child to the current Node.");
-
-      element = element->NextSiblingElement();
-    }
+    }
+    LOAD_PARAM_END_CYCLE(element);
   }
 }

trunk/src/lib/particles/particle_engine.cc

@@ -90 +90 @@
 void ParticleEngine::loadParams(const TiXmlElement* root)
 {
-  const TiXmlElement* element = root->FirstChildElement();
-  while( element != NULL)
-  {
-    LoadParam<ParticleEngine>(element, "connect", this, &ParticleEngine::addConnection, true)
+  LOAD_PARAM_START_CYCLE(root, element);
+  {
+    LoadParam_CYCLE(element, "connect", this, ParticleEngine, addConnection)
         .describe("connects an Emitter to a System (emitterName, systemName)");
-    element = element->NextSiblingElement();
-  }
+  }
+  LOAD_PARAM_END_CYCLE(element);
 }
 

trunk/src/lib/particles/particle_system.cc

@@ -122 +122 @@
       .describe("the maximal count of Particles, that can be emitted into this system");
 
-  //LoadParam<ParticleSystem>(root, "type", this, &ParticleSystem::setType);
   LoadParamNEW(root, "life-span", this, ParticleSystem, setLifeSpan)
       .describe("sets the life-span of the Particles.");
@@ -132 +131 @@
       .describe("sets the type of the Particles, (dot, spark, sprite or model)");
 
-  const TiXmlElement* element = root->FirstChildElement();
-  while (element != NULL)
+  LOAD_PARAM_START_CYCLE(root, element);
   {
-
+    element->ToText();
   // PER-PARTICLE-ATTRIBUTES:
-    LoadParam<ParticleSystem>(element, "radius", this, &ParticleSystem::setRadius, true)
+    LoadParam_CYCLE(element, "radius", this, ParticleSystem, setRadius)
         .describe("The Radius of each particle over time (TimeIndex [0-1], radius at TimeIndex, randomRadius at TimeIndex)");
 
-    LoadParam<ParticleSystem>(element, "mass", this, &ParticleSystem::setMass, true)
+    LoadParam_CYCLE(element, "mass", this, ParticleSystem, setMass)
         .describe("The Mass of each particle over time (TimeIndex: [0-1], mass at TimeIndex, randomMass at TimeIndex)");
 
-    LoadParam<ParticleSystem>(element, "color", this, &ParticleSystem::setColor, true)
+    LoadParam_CYCLE(element, "color", this, ParticleSystem, setColor)
         .describe("The Color of each particle over time (TimeIndex: [0-1], red: [0-1], green: [0-1], blue: [0-1], alpha: [0-1])");
-    element = element->NextSiblingElement();
   }
+  LOAD_PARAM_END_CYCLE(element);
 
 }