Changeset 4592 in orxonox.OLD for orxonox/trunk/src/util/loading

Timestamp:

Jun 10, 2005, 7:17:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: derivations work.
now the only thing to do is specify all the classes, and DO it CLEAN.

@patrick: is it ok, how i treated your ObjectManager??

File:

• orxonox/trunk/src/util/loading/load_param.h (modified) (9 diffs)

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

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -14 +14 @@
 */
 
-/*! 
+/*!
     \file load_param.h
     \brief A Class and macro-functions, that makes our lives easy to load-in parameters
@@ -74 +74 @@
 #define LoadParam1(type1) \
  LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(type1##_TYPE), bool multi = false) \
-   : BaseLoadParam(root, pt2Object, paramName, 1, multi, type1##_NAME)          \
-    { \
-      if (loadString != NULL && root != NULL) \
-        (*pt2Object.*function)(type1##_FUNC(loadString)); \
-      else \
-        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
+   : BaseLoadParam(root, pt2Object, paramName, 1, multi, type1##_NAME)          \
+    { \
+      if (loadString != NULL && root != NULL) \
+        (*pt2Object.*function)(type1##_FUNC(loadString)); \
+      else \
+        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
     }
 
@@ -94 +94 @@
     { \
       if (loadString != NULL && root != NULL) \
-        { \
-          SubString subLoads(loadString); \
-          if (subLoads.getCount() == 2) \
-            (*pt2Object.*function)(type1##_FUNC(subLoads.getString(0)), type2##_FUNC(subLoads.getString(1))); \
-          else \
-            PRINTF(2)("Not loaded Parameter %s of %s, because wrong count of arguments.\n -> Should have %d but have %d\n", \
-                      paramName, pt2Object->getClassName(), 2, subLoads.getCount()); \
-        } \
-      else \
-        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
+        { \
+          SubString subLoads(loadString); \
+          if (subLoads.getCount() == 2) \
+            (*pt2Object.*function)(type1##_FUNC(subLoads.getString(0)), type2##_FUNC(subLoads.getString(1))); \
+          else \
+            PRINTF(2)("Not loaded Parameter %s of %s, because wrong count of arguments.\n -> Should have %d but have %d\n", \
+                      paramName, pt2Object->getClassName(), 2, subLoads.getCount()); \
+        } \
+      else \
+        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
     }
 
@@ -119 +119 @@
     { \
       if (loadString != NULL && root != NULL) \
-        { \
-          SubString subLoads(loadString); \
-          if (subLoads.getCount() == 3) \
-            (*pt2Object.*function)(type1##_FUNC(subLoads.getString(0)), type2##_FUNC(subLoads.getString(1)), type3##_FUNC(subLoads.getString(2))); \
-          else \
-            PRINTF(2)("Not loaded Parameter %s of %s, because wrong count of arguments.\n -> Should have %d but have %d\n", \
-                      paramName, pt2Object->getClassName(), 3, subLoads.getCount()); \
-        } \
-      else \
-        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
+        { \
+          SubString subLoads(loadString); \
+          if (subLoads.getCount() == 3) \
+            (*pt2Object.*function)(type1##_FUNC(subLoads.getString(0)), type2##_FUNC(subLoads.getString(1)), type3##_FUNC(subLoads.getString(2))); \
+          else \
+            PRINTF(2)("Not loaded Parameter %s of %s, because wrong count of arguments.\n -> Should have %d but have %d\n", \
+                      paramName, pt2Object->getClassName(), 3, subLoads.getCount()); \
+        } \
+      else \
+        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
     }
 
@@ -145 +145 @@
     { \
       if (loadString != NULL && root != NULL) \
-        { \
-          SubString subLoads(loadString); \
-          if (subLoads.getCount() == 4) \
-            (*pt2Object.*function)(type1##_FUNC(subLoads.getString(0)), type2##_FUNC(subLoads.getString(1)), type3##_FUNC(subLoads.getString(2)), type4##_FUNC(subLoads.getString(3))); \
-          else \
-            PRINTF(2)("Not loaded Parameter %s of %s, because wrong count of arguments.\n -> Should have %d but have %d\n", \
-                      paramName, pt2Object->getClassName(), 4, subLoads.getCount()); \
-        } \
-      else \
-        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
+        { \
+          SubString subLoads(loadString); \
+          if (subLoads.getCount() == 4) \
+            (*pt2Object.*function)(type1##_FUNC(subLoads.getString(0)), type2##_FUNC(subLoads.getString(1)), type3##_FUNC(subLoads.getString(2)), type4##_FUNC(subLoads.getString(3))); \
+          else \
+            PRINTF(2)("Not loaded Parameter %s of %s, because wrong count of arguments.\n -> Should have %d but have %d\n", \
+                      paramName, pt2Object->getClassName(), 4, subLoads.getCount()); \
+        } \
+      else \
+        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
     }
 
@@ -172 +172 @@
     { \
       if (loadString != NULL && root != NULL) \
-        { \
-          SubString subLoads(loadString); \
-          if (subLoads.getCount() == 5) \
-            (*pt2Object.*function)(type1##_FUNC(subLoads.getString(0)), type2##_FUNC(subLoads.getString(1)), type3##_FUNC(subLoads.getString(2)), type4##_FUNC(subLoads.getString(3)), type5##_FUNC(subLoads.getString(4))); \
-          else \
-            PRINTF(2)("Not loaded Parameter %s of %s, because wrong count of arguments.\n -> Should have %d but have %d\n", \
-                      paramName, pt2Object->getClassName(), 5, subLoads.getCount()); \
-        } \
-      else \
-        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
+        { \
+          SubString subLoads(loadString); \
+          if (subLoads.getCount() == 5) \
+            (*pt2Object.*function)(type1##_FUNC(subLoads.getString(0)), type2##_FUNC(subLoads.getString(1)), type3##_FUNC(subLoads.getString(2)), type4##_FUNC(subLoads.getString(3)), type5##_FUNC(subLoads.getString(4))); \
+          else \
+            PRINTF(2)("Not loaded Parameter %s of %s, because wrong count of arguments.\n -> Should have %d but have %d\n", \
+                      paramName, pt2Object->getClassName(), 5, subLoads.getCount()); \
+        } \
+      else \
+        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName()); \
     }
 
@@ -216 +216 @@
   static LoadClassDescription* addClass(const char* className);
   LoadParamDescription* addParam(const char* paramName);
-  
+
 
   static void printAll(const char* fileName = NULL);
@@ -249 +249 @@
   LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(), bool multi = false)
     : BaseLoadParam(root, pt2Object, paramName, 0, multi, "")
-    { 
+    {
       if (loadString != NULL && root != NULL)
-        (*pt2Object.*function)(); 
-      else 
-        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());
+        (*pt2Object.*function)();
+      else
+        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());
     }