Changeset 5151 in orxonox.OLD for trunk/src

Timestamp:

Aug 27, 2005, 12:59:28 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: default Values are passed along

Location:

trunk/src/util

Files:

• shell.cc (modified) (1 diff)
• shell_command.h (modified) (4 diffs)

trunk/src/util/shell.cc

@@ -80 +80 @@
   ShellCommand<Shell>::registerCommand("clear", CL_SHELL, &Shell::clear);
   ShellCommand<Shell>::registerCommand("testS", CL_SHELL, &Shell::testS);
-  ShellCommand<Shell>::registerCommand("testI", CL_SHELL, &Shell::testI);
+  ShellCommand<Shell>::registerCommand("testI", CL_SHELL, &Shell::testI, 5);
 }
 

trunk/src/util/shell_command.h

@@ -26 +26 @@
 // MACRO DEFINITIONS //
 ///////////////////////
+#define   l_BOOL_DEFGRAB(i)         this->defaultBools[i]
+#define   l_INT_DEFGRAB(i)          this->defaultInts[i]
+#define   l_UINT_DEFGRAB(i)         (unsigned int)this->defaultInts[i]
+#define   l_LONG_DEFGRAB(i)         (long)this->defaultInts[i]
+#define   l_FLOAT_DEFGRAB(i)        this->defaultFloats[i]
+#define   l_STRING_DEFGRAB(i)       this->defaultStrings[i]
 
 // COMMAND REGISTRATION
@@ -70 +76 @@
 #define ShellCommandExecute1(t1) \
    else if (this->paramCount == 1 && this->parameters[0] == t1##_PARAM) \
-    (dynamic_cast<T*>(object)->*functionPointer_1_##t1)(t1##_FUNC(parameters, 0))
+    (dynamic_cast<T*>(object)->*functionPointer_1_##t1)(t1##_FUNC(parameters, t1##_DEFGRAB(0)))
 
 
@@ -101 +107 @@
     unsigned int*                    parameters;          //!< Parameters
     bool                             isSingleton;         //!< if the Class is Singleton @todo autocheck
+    char*                            defaultStrings[FUNCTOR_MAX_ARGUMENTS];
+    int                              defaultInts[FUNCTOR_MAX_ARGUMENTS];
+    float                            defaultFloats[FUNCTOR_MAX_ARGUMENTS];
+    bool                             defaultBools[FUNCTOR_MAX_ARGUMENTS];
 
   private:
@@ -106 +116 @@
     const char*                      className;           //!< The Name of the Class associated to this Command
 
-    char*                            defaultStrings[FUNCTOR_MAX_ARGUMENTS];
-    int                              defaultInts[FUNCTOR_MAX_ARGUMENTS];
-    float                            defaultFloats[FUNCTOR_MAX_ARGUMENTS];
-    bool                             defaultBools[FUNCTOR_MAX_ARGUMENTS];
-
-
     // STATIC MEMBERS
     static tList<ShellCommandBase>*  commandList;         //!< A list of availiable commands.
 };
-
-template<class T> class ShellCommand;
-/*
-template<class T> class ShellCommandSingleton : public ShellCommandBase
-{
-  friend class ShellCommand<T>;
-  private:
-    ShellCommandSingleton(const char* commandName, ClassID classID, void (T::*functionPointer)())
-    : ShellCommandBase (commandName, classID, 0)
-    {
-      this->functionPointer_NULL = functionPointer;
-    }
-    void (T::*functionPointer_NULL)();
-
-    virtual void executeCommand (const char* parameters)
-    {
-      if (this->paramCount == 0)
-        (T::getInstance()->*functionPointer_NULL)();
-    }
-};*/
-
 
 //! keeps information about a ShellCommand