Changeset 5136 in orxonox.OLD for trunk/src/util

Timestamp:

Aug 26, 2005, 1:24:02 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: registering singleton-Classes now

Location:

trunk/src/util

Files:

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

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, this, &Shell::clear);
+  ShellCommand<Shell>::registerCommand("clear", CL_NULL, &Shell::clear, true);
 }
 

trunk/src/util/shell_command.h

@@ -76 +76 @@
 };
 
+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)();
+    }
+};
 
 
@@ -85 +103 @@
     static void unregisterCommand(const char* commandNaame, ClassID classID);
 
-    static void registerCommand(const char* commandName, ClassID classID, T* object, void (T::*functionPointer)())
+    static void registerCommand(const char* commandName, ClassID classID, void (T::*functionPointer)(), bool isSingleton = false)
     {
       if (isRegistered(commandName, classID, 0)== true)
         return;
       else
-        ShellCommand<T>* newCommand = new ShellCommand<T>(commandName, classID, object, functionPointer);
+      {
+        if (isSingleton == false)
+          new ShellCommand<T>(commandName, classID, functionPointer);
+        else
+          new ShellCommandSingleton<T>(commandName, classID, functionPointer);
+      }
     }
+
   private:
     void (T::*functionPointer_NULL)();
-    ShellCommand(const char* commandName, ClassID classID, T* object, void (T::*functionPointer)())
+    ShellCommand(const char* commandName, ClassID classID, void (T::*functionPointer)())
       : ShellCommandBase (commandName, classID, 0)
     {
       this->functionPointer_NULL = functionPointer;
-      this->objectPointer = object;
     }
     virtual void executeCommand (const char* parameters)
     {
-      if (this->paramCount == 0)
-        (objectPointer->*functionPointer_NULL)();
+/*      if (this->paramCount == 0)
+        (objectPointer->*functionPointer_NULL)();*/
     }
 
@@ -114 +137 @@
 
   private:
-
-
-  public:
-    T*                   objectPointer;       //!< 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 )
 };