Changeset 5130 in orxonox.OLD for trunk/src

Timestamp:

Aug 26, 2005, 12:04:43 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: flush

Location:

trunk/src/util

Files:

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

trunk/src/util/shell.cc

@@ -76 +76 @@
     evh->subscribe(this, ES_SHELL, i);
 
-
-//  this->registerCommand("clear", Shell::)
+  //void ShellCommand<T>::registerCommand(const char* commandName, ClassID classID, T* object, void* functionPointer, unsigned int paramCount, ...)
+
+  ShellCommand<Shell>::registerCommand("clear", CL_NULL, this, &Shell::clear, 0, 1);
 }
 
@@ -458 +459 @@
   if (!strcmp(this->inputLine, "clear"))
   {
-    this->flushBuffers();
-    this->addBufferLine("orxonox - shell\n ==================== \n", NULL);
+    this->clear();
   }
 
@@ -465 +465 @@
 
   return false;
+}
+
+void Shell::clear()
+{
+  this->flushBuffers();
+  this->addBufferLine("orxonox - shell\n ==================== \n", NULL);
 }
 

trunk/src/util/shell.h

@@ -61 +61 @@
     bool executeCommand();
 
+    void clear();
+
     void setRepeatDelay(float repeatDelay, float repeatRate);
 

trunk/src/util/shell_command.cc

@@ -28 +28 @@
 using namespace std;
 
-ShellCommandBase::ShellCommandBase(const char* commandName, ClassID classID)
+ShellCommandBase::ShellCommandBase(const char* commandName, ClassID classID, void* functionPointer, unsigned int paramCount, va_list parameters)
 {
   this->classID = classID;
+  this->functionPointer = functionPointer;
   this->commandName = new char[strlen(commandName)+1];
   strcpy(this->commandName, commandName);
 
+  // handling parameters, and storing them:
+  this->paramCount = paramCount;
+  this->parameters = new ShellParameterType[paramCount];
+
+  for (unsigned int i = 0; i < paramCount; i++)
+    parameters[i] = va_arg(parameters, long);
+
+  // adding this ShellCommand to the list of known Commands
   ShellCommandBase::commandList->add(this);
 }
 
+ShellCommandBase::~ShellCommandBase()
+{
+  delete[] this->commandName;
+  delete[] this->parameters;
+}
 
 
 tList<ShellCommandBase>* ShellCommandBase::commandList = NULL;
 
-bool ShellCommandBase::isRegistered(const char* commandName, ClassID classID)
+bool ShellCommandBase::isRegistered(const char* commandName, ClassID classID, unsigned int paramCount, va_list parameters)
 {
   if (ShellCommandBase::commandList == NULL)

trunk/src/util/shell_command.h

@@ -11 +11 @@
 #include <stdarg.h>
 
+#define MAX_SHELL_COMMAND_SIZE
+
 typedef enum ShellParameterType
 {
@@ -22 +24 @@
 };
 
+
 // FORWARD DECLARATION
 template<class T> class tList;
 template<class T> class tIterator;
-#define MAX_SHELL_COMMAND_SIZE
 
-class ShellCommandBase
+class ShellCommandBase : public BaseObject
 {
   public:
     static bool execute (const char* executionString);
 
+//    virtual void execute (...);
+
   protected:
-    ShellCommandBase(const char* commandName, ClassID classID);
+    ShellCommandBase(const char* commandName, ClassID classID, void* functionPointer, unsigned int paramCount, va_list parameters);
+    ~ShellCommandBase();
 
-    static bool isRegistered(const char* commandName, ClassID classID);
+    static bool isRegistered(const char* commandName, ClassID classID, unsigned int paramCount, va_list parameters);
 
+
+  protected:
+    void*                            functionPointer;     //!< The pointeer to the function of the Class (or static pointer if ClassID == CL_NULL )
+    unsigned int                     paramCount;          //!< the count of parameters
+    ShellParameterType*              parameters;          //!< Parameters
 
   private:
@@ -42 +52 @@
     long                             classID;             //!< The ID of the Class asociated to this Command
 
-
+    // STATIC MEMBERS
     static tList<ShellCommandBase>*  commandList;         //!< A list of availiable commands.
 };
@@ -50 +60 @@
 {
   public:
-    static void registerCommand(const char* commandName, void* pointerToFunction, ClassID classID, ShellParameterType param1Type, void* Object = NULL);
+    static void registerCommand(const char* commandName, ClassID classID, T* object, void (T::*functionPointer)(), unsigned int paramCount, ...);
 
     static void unregisterCommand(const char* commandNaame, ClassID classID);
 
   private:
-    ShellCommand(const char* command, void* pointerToFunction, ClassID classID, ShellParameterType param1Type, void* Object = NULL);
+    ShellCommand(const char* command, ClassID classID, T* object, void* functionPointer, unsigned int paramCount, va_list parameters);
 
 
   public:
-    void*                functionPointer;     //!< The pointer to the function of the Class (or static pointer if ClassID == CL_NULL )
-    T*                   Object;              //!< The pointer to the object to apply this function to (NULL if classID == CL_NULL )
+    T*                   objectPointer;       //!< The pointer to the object to apply this function to (NULL if classID == CL_NULL )
 };
 
 template<class T>
-    ShellCommand<T>::ShellCommand(const char* commandName, void* pointerToFunction, ClassID classID, ShellParameterType param1Type, void* Object)
-  : ShellCommandBase (command, classID)
+    ShellCommand<T>::ShellCommand(const char* commandName, ClassID classID, T* object, void* functionPointer, unsigned int paramCount, va_list parameters)
+  : ShellCommandBase (commandName, classID, functionPointer, paramCount, parameters)
 {
 
@@ -71 +80 @@
 
 template<class T>
-    void ShellCommand<T>::registerCommand(const char* commandName, void* pointerToFunction, ClassID classID, ShellParameterType param1Type, void* Object)
+    void ShellCommand<T>::registerCommand(const char* commandName, ClassID classID, T* object, void (T::*functionPointer)(), unsigned int paramCount, ...)
 {
-  if (isRegistered() == true)
+  va_list parameters;
+  va_start(parameters, paramCount);
+
+  if (isRegistered(commandName, classID, paramCount, parameters) == true)
     return;
   else
   {
-    ShellCommand<T>* newCommand = new ShellCommand<T>(command);
-    elem->functionPointer = pointerToFunction;
-    elem->parameter1 = param1Type;
-    elem->Object = Object;
 
-
+//    ShellCommand<T>* newCommand = new ShellCommand<T>(commandName, classID, object, functionPointer, paramCount, parameters);
   }
 }