Changeset 7218

Timestamp:

Aug 25, 2010, 11:46:32 PM (14 years ago)

Author:

landauf

Message:

some improvements/fixes in ConsoleCommand

Location:

code/branches/consolecommands3/src/libraries/core/command

Files:

• ConsoleCommand.cc (modified) (4 diffs)
• ConsoleCommand.h (modified) (7 diffs)

code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.cc

@@ -93 +93 @@
     bool _ConsoleCommand::isActive() const
     {
-        return (this->bActive_ && this->executor_ && this->executor_->getFunctor());
+        return (this->bActive_ && this->executor_ && this->executor_->getFunctor() && (this->executor_->getFunctor()->getType() == Functor::Type::Static || this->executor_->getFunctor()->getRawObjectPointer()));
     }
 
@@ -154 +154 @@
             if (this->executor_)
                 this->executor_->setFunctor(functor);
-            else
+            else if (functor)
                 this->executor_ = createExecutor(functor);
 
@@ -208 +208 @@
         if (command.executor_)
             this->executor_->setFunctor(command.functor_);
+    }
+
+    void _ConsoleCommand::resetFunction()
+    {
+        if (this->executor_)
+            this->executor_->setFunctor(0);
     }
 
@@ -453 +459 @@
     /* static */ void _ConsoleCommand::destroyAll()
     {
-        while (!_ConsoleCommand::getCommandMap().empty() && !_ConsoleCommand::getCommandMap().begin().empty())
-            _ConsoleCommand::getCommandMap().begin().erase(_ConsoleCommand::getCommandMap().begin().begin());
+        while (!_ConsoleCommand::getCommandMap().empty() && !_ConsoleCommand::getCommandMap().begin()->second.empty())
+            delete _ConsoleCommand::getCommandMap().begin()->second.begin()->second;
     }
 }

code/branches/consolecommands3/src/libraries/core/command/ConsoleCommand.h

@@ -51 +51 @@
 
 #define _SetConsoleCommandGeneric(group, name, functor) \
-    orxonox::_ConsoleCommand& BOOST_PP_CAT(__consolecommand_, __LINE__) = (*orxonox::_createConsoleCommand(group, name, orxonox::createExecutor(functor)))
+    static orxonox::_ConsoleCommand& BOOST_PP_CAT(__consolecommand_, __LINE__) = (*orxonox::_createConsoleCommand(group, name, orxonox::createExecutor(functor)))
 
 
@@ -64 +64 @@
 
 #define _DeclareConsoleCommandGeneric(group, name, functor) \
-    orxonox::_ConsoleCommand& BOOST_PP_CAT(__consolecommand_, __LINE__) = orxonox::_createConsoleCommand(group, name, orxonox::createExecutor(functor), false)
+    static orxonox::_ConsoleCommand& BOOST_PP_CAT(__consolecommand_, __LINE__) = (*orxonox::_createConsoleCommand(group, name, orxonox::createExecutor(functor), false))
 
 
 namespace orxonox
 {
+    namespace prototype
+    {
+        inline void void__void(void) {}
+        inline void void__string(const std::string&) {}
+    }
+
+    namespace AccessLevel
+    {
+        enum Enum
+        {
+            All,
+            Standalone,
+            Master,
+            Server,
+            Client,
+            Online,
+            Offline,
+            None
+        };
+    }
+
     class _CoreExport _ConsoleCommand
     {
@@ -77 +98 @@
             ExecutorPtr executor_;
             FunctorPtr functor_;
-        };
-
-        struct AccessLevel
-        {
-            enum Enum
-            {
-                All,
-                Standalone,
-                Master,
-                Server,
-                Client,
-                Online,
-                Offline,
-                None
-            };
         };
 
@@ -150 +156 @@
                         { if (this->command_) { this->command_->popFunction(); } return *this; }
 
+                    inline _ConsoleCommandManipulator& resetFunction()
+                        { if (this->command_) { this->command_->resetFunction(); } return *this; }
+
                     inline _ConsoleCommandManipulator& setObject(void* object)
                         { if (this->command_) { this->command_->setObject(object); } return *this; }
@@ -184 +193 @@
                         { if (this->command_) { this->command_->defaultValue(index, param); } return *this; }
 
-                    inline _ConsoleCommandManipulator& accessLevel(_ConsoleCommand::AccessLevel::Enum level)
+                    inline _ConsoleCommandManipulator& accessLevel(AccessLevel::Enum level)
                         { if (this->command_) { this->command_->accessLevel(level); } return *this; }
 
@@ -210 +219 @@
             _ConsoleCommand& addGroup(const std::string& group, const std::string&  name);
 
-            inline _ConsoleCommand setActive(bool bActive)
+            inline const std::string& getName() const
+                { return this->baseName_; }
+
+            const ExecutorPtr& getExecutor() const;
+            inline const ExecutorPtr& getBaseExecutor() const
+                { return this->baseExecutor_; }
+
+            inline _ConsoleCommand& setActive(bool bActive)
                 { this->bActive_ = bActive; return *this; }
-            inline _ConsoleCommand activate()
+            inline _ConsoleCommand& activate()
                 { return this->setActive(true); }
-            inline _ConsoleCommand deactivate()
+            inline _ConsoleCommand& deactivate()
                 { return this->setActive(false); }
 
@@ -291 +307 @@
             void pushFunction();
             void popFunction();
-            const ExecutorPtr& getExecutor() const;
-            const FunctorPtr& getFunctor() const;
+            void resetFunction();
 
             bool setObject(void* object);