Changeset 4242 in orxonox.OLD

Timestamp:

May 20, 2005, 3:55:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/levelLoader: better compatibility with more functions

Location:

orxonox/branches/levelLoader/src

Files:

• glmenu/glmenu_imagescreen.cc (modified) (1 diff)
• util/loading/load_param.h (modified) (2 diffs)
• world_entities/skybox.cc (modified) (2 diffs)
• world_entities/skybox.h (modified) (1 diff)

orxonox/branches/levelLoader/src/glmenu/glmenu_imagescreen.cc

@@ -58 +58 @@
 void GLMenuImageScreen::load(TiXmlElement* root)
 {
-  const char* string;
-
   LoadParam<GLMenuImageScreen>(root, "BackgroundImage", this, &GLMenuImageScreen::setBackgroundImage);
 

orxonox/branches/levelLoader/src/util/loading/load_param.h

@@ -19 +19 @@
 {
  public:
-  // CONST CHAR*
+  // 1. CONST CHAR*
   LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(const char*))
-    { 
+    {
       const char* loadString = grabParameter(root, paramName);
       if (loadString != NULL)
@@ -27 +27 @@
       else 
         PRINTF(2)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());
-      
+    };
+
+  // 2. CONST CHAR*
+  LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(const char*, const char*))
+    {
+      const char* loadString = grabParameter(root, paramName);
+      if (loadString != NULL)
+        {
+          SubString subLoads(loadString);
+          (*pt2Object.*function)(subLoads.getString(0), subLoads.getString(1));
+        }
+      else 
+        PRINTF(2)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());
+    };
+
+  // 3. CONST CHAR*
+  LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(const char*, const char*, const char*))
+    {
+      const char* loadString = grabParameter(root, paramName);
+      if (loadString != NULL)
+        {
+          SubString subLoads(loadString);
+          (*pt2Object.*function)(subLoads.getString(0), subLoads.getString(1), subLoads.getString(2));
+        }
+      else 
+        PRINTF(2)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());
+    };
+
+  // 4. CONST CHAR*
+  LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(const char*, const char*, const char*, const char*))
+    {
+      const char* loadString = grabParameter(root, paramName);
+      if (loadString != NULL)
+        {
+          SubString subLoads(loadString);
+          (*pt2Object.*function)(subLoads.getString(0), subLoads.getString(1), subLoads.getString(2), subLoads.getString(3));
+        }
+      else 
+        PRINTF(2)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());
     };
 

orxonox/branches/levelLoader/src/world_entities/skybox.cc

@@ -56 +56 @@
   this->preInit();
 
-  const char* string;
-
-  // Model Loading      
   LoadParam<SkyBox>(root, "Materialset", this, &SkyBox::setTexture);
 
@@ -107 +104 @@
                "skybox_right.jpg", "skybox_front.jpg", "skybox_back.jpg");
 */
-void SkyBox::setTexture(const char* name, const char* extension)
+void SkyBox::setTextureAndType(const char* name, const char* extension)
 {
   char* top    = new char[strlen(name)+strlen(extension)+ 10];

orxonox/branches/levelLoader/src/world_entities/skybox.h

@@ -32 +32 @@
   void setSize(float size);
   /** \brief assumes jpg as input-format */
-  void setTexture(const char* name) { setTexture (name, "jpg");};
-  void setTexture(const char* name, const char* extension);
+  void setTexture(const char* name) { setTextureAndType (name, "jpg");};
+  void setTextureAndType(const char* name, const char* extension);
   void setTextures(const char* top, const char* bottom, const char* left, const char* right, const char* front, const char* back);