Changeset 5137 in orxonox.OLD

Timestamp:

Aug 26, 2005, 1:41:54 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better macro-definition

Location:

trunk/src

Files:

• defs/class_id.h (modified) (2 diffs)
• defs/functor_list.h (modified) (1 diff)
• util/loading/load_param.h (modified) (2 diffs)
• util/shell.cc (modified) (1 diff)
• util/shell_command.cc (modified) (1 diff)
• util/shell_command.h (modified) (3 diffs)

trunk/src/defs/class_id.h

@@ -110 +110 @@
   CL_RENDER_2D                  =    0x00000f21,
   CL_NULL_ELEMENT_2D            =    0x00000f22,
+  CL_SHELL                      =    0x00000f31,
 
 
@@ -193 +194 @@
   CL_NUMBER                     =    0x00000b0c,
   CL_FAST_FACTORY               =    0x00000c01,
-  CL_SHELL                      =    0x00000c11,
 
 

trunk/src/defs/functor_list.h

@@ -101 +101 @@
 
 #ifdef FUNCTOR_LIST
+  FUNCTOR_LIST(0)()
   //! makes functions with one string
   FUNCTOR_LIST(1)(l_STRING);

trunk/src/util/loading/load_param.h

@@ -62 +62 @@
 **** MACROS DEFINITIONS OF LOADABLES *****
 *****************************************/
+// 0. TYPES
+/**
+ *  a Macro to easily implement many different Constructors for the LoadParam-Class with no argument
+ */
+#define LoadParam0() \
+LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(), bool multi = false) \
+  : BaseLoadParam(root, pt2Object, paramName, 0, multi, NULL, "") \
+{ \
+  if (loadString != NULL && root != NULL) \
+    (*pt2Object.*function)(); \
+  else \
+    PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());\
+}
+
 // 1. TYPE
 /**
@@ -287 +301 @@
 template<class T> class LoadParam : public BaseLoadParam
 {
- public:
-  LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(), bool multi = false)
-    : BaseLoadParam(root, pt2Object, paramName, 0, multi, NULL, "")
-    {
-      if (loadString != NULL && root != NULL)
-        (*pt2Object.*function)();
-      else
-        PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());
-    }
-
+  public:
 
 #define FUNCTOR_LIST(x)    LoadParam ## x

trunk/src/util/shell.cc

@@ -78 +78 @@
   //void ShellCommand<T>::registerCommand(const char* commandName, ClassID classID, T* object, void* functionPointer, unsigned int paramCount, ...)
 
-  ShellCommand<Shell>::registerCommand("clear", CL_NULL, &Shell::clear, true);
+  ShellCommand<Shell>::registerCommand("clear", CL_SHELL, &Shell::clear);
 }
 

trunk/src/util/shell_command.cc

@@ -85 +85 @@
 }
 
-
 bool ShellCommandBase::execute(const char* executionString)
 {

trunk/src/util/shell_command.h

@@ -62 +62 @@
     static bool isRegistered(const char* commandName, ClassID classID, unsigned int paramCount, ...);
 
-
   protected:
     void*                            functionPointer;     //!< The pointeer to the function of the Class (or static pointer if ClassID == CL_NULL )
@@ -103 +102 @@
     static void unregisterCommand(const char* commandNaame, ClassID classID);
 
-    static void registerCommand(const char* commandName, ClassID classID, void (T::*functionPointer)(), bool isSingleton = false)
+    static void registerCommand(const char* commandName, ClassID classID, void (T::*functionPointer)())
     {
       if (isRegistered(commandName, classID, 0)== true)
@@ -109 +108 @@
       else
       {
-        if (isSingleton == false)
+        if (classID & CL_MASK_SINGLETON == CL_MASK_SINGLETON)
+          new ShellCommandSingleton<T>(commandName, classID, functionPointer);
+        else
           new ShellCommand<T>(commandName, classID, functionPointer);
-        else
-          new ShellCommandSingleton<T>(commandName, classID, functionPointer);
       }
     }