Changeset 4733 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 29, 2005, 11:58:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: loading clean now

Location:

orxonox/trunk/src/lib

Files:

• graphics/graphics_engine.cc (modified) (1 diff)
• physics/physics_engine.cc (modified) (3 diffs)
• physics/physics_engine.h (modified) (1 diff)

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -93 +93 @@
 
   // setting up the Resolution
-  this->setResolution(1000, 800, 16);
+  this->setResolution(1400, 1050, 16);
 
 

orxonox/trunk/src/lib/physics/physics_engine.cc

@@ -23 +23 @@
 #include "tinyxml.h"
 #include "factory.h"
+#include "load_param.h"
 
 using namespace std;
@@ -58 +59 @@
 void PhysicsEngine::loadParams(const TiXmlElement* root)
 {
-  const TiXmlElement* element = NULL;
-
+  LoadParam<PhysicsEngine>(root, "Fields", this, &PhysicsEngine::loadFields)
+      .describe("loads a list of fields");
+
+  LoadParam<PhysicsEngine>(root, "Connections", this, &PhysicsEngine::loadConnections)
+      .describe("loads a list of fields");
+}
+
+/**
+ * \param root the XML-element to Load the PhysicsField from
+ */
+void PhysicsEngine::loadFields(const TiXmlElement* root)
+{
   PRINTF(4)("Loading Physical Fields\n");
-  element = root->FirstChildElement("Fields");
-  element = element->FirstChildElement();
+
+  const TiXmlElement* element = root->FirstChildElement();
   while (element != NULL)
   {
@@ -69 +80 @@
     element = element->NextSiblingElement();
   }
-  element = NULL;
-
+}
+
+/**
+ * \param root the XML-element to load the PhysicsConnection from
+ */
+void PhysicsEngine::loadConnections(const TiXmlElement* root)
+{
   PRINTF(4)("Loading Physical Connections\n");
-  element = root->FirstChildElement("Connections");
-  element = element->FirstChildElement();
+
+  const TiXmlElement* element = root->FirstChildElement();
   while (element != NULL)
   {

orxonox/trunk/src/lib/physics/physics_engine.h

@@ -27 +27 @@
 
   void loadParams(const TiXmlElement* root);
+  void loadFields(const TiXmlElement* root);
+  void loadConnections(const TiXmlElement* root);
 
   void                   addPhysicsInterface(PhysicsInterface* physicsInterface);