Changeset 4252 in orxonox.OLD

Timestamp:

May 21, 2005, 11:39:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/levelLoader: macro-war

Location:

orxonox/branches/levelLoader/src/util/loading

Files:

• factory.h (modified) (1 diff)
• load_param.cc (modified) (1 diff)
• load_param.h (modified) (7 diffs)

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

@@ -33 +33 @@
     this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
 */
-#define CREATE_FACTORY(x) tFactory<x>* global_ ## x ## Factory = new tFactory<x>(#x)
+#define CREATE_FACTORY(CLASS_NAME) tFactory<CLASS_NAME>* global_##CLASS_NAME##Factory = new tFactory<CLASS_NAME>(#CLASS_NAME); \
+        CREATE_LOAD_DOC(CLASS_NAME)
 
 

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

@@ -26 +26 @@
    \brief if the description of Parameters should be executed
 */
-bool LoadClassDescription::ParametersDescription = false;
+bool LoadClassDescription::parametersDescription = false;

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

@@ -68 +68 @@
     { \
       const char* loadString = grabParameter(root, paramName); \
-      if (loadString != NULL) \
+      if (loadString != NULL && root != NULL) \
         (*pt2Object.*function)(type1##_FUNC(loadString)); \
       else \
@@ -81 +81 @@
     { \
       const char* loadString = grabParameter(root, paramName); \
-      if (loadString != NULL) \
+      if (loadString != NULL && root != NULL) \
         { \
           SubString subLoads(loadString); \
@@ -101 +101 @@
     { \
       const char* loadString = grabParameter(root, paramName); \
-      if (loadString != NULL) \
+      if (loadString != NULL && root != NULL) \
         { \
           SubString subLoads(loadString); \
@@ -121 +121 @@
     { \
       const char* loadString = grabParameter(root, paramName); \
-      if (loadString != NULL) \
+      if (loadString != NULL && root != NULL) \
         { \
           SubString subLoads(loadString); \
@@ -141 +141 @@
     { \
       const char* loadString = grabParameter(root, paramName); \
-      if (loadString != NULL) \
+      if (loadString != NULL && root != NULL) \
         { \
           SubString subLoads(loadString); \
@@ -155 +155 @@
 
 
+
+#define CREATE_LOAD_DOC(CLASS_NAME) \
+
+/*  void documentLoadClass(void) \
+    { \
+      if(LoadClassDescription::parametersDescription) \
+        { \
+          CLASS_NAME docuClass; \
+          docuClass.load(NULL); \
+        } \
+    } \
+  documentLoadClass();
+*/
 
 class LoadParamDescription
@@ -170 +183 @@
 
 
-  static bool ParametersDescription;
+  static bool parametersDescription;
   
  private: