Changeset 10352 for code/branches/core7

Timestamp:

Apr 8, 2015, 11:15:11 PM (10 years ago)

Author:

landauf

Message:

wrap ConsoleCommands in StaticallyInitializedInstances

Location:

code/branches/core7/src/libraries/core

Files:

• Core.cc (modified) (1 diff)
• command/CMakeLists.txt (modified) (1 diff)
• command/ConsoleCommand.cc (modified) (5 diffs)
• command/ConsoleCommand.h (modified) (3 diffs)
• command/ConsoleCommandIncludes.cc (added)
• command/ConsoleCommandIncludes.h (modified) (3 diffs)

code/branches/core7/src/libraries/core/Core.cc

@@ -141 +141 @@
 
         // TODO: initialize CommandLineParser here
+        // TODO: initialize ConsoleCommandManager here
         ModuleInstance::getCurrentModuleInstance()->loadAllStaticallyInitializedInstances();
 

code/branches/core7/src/libraries/core/command/CMakeLists.txt

@@ -4 +4 @@
   ConsoleCommand.cc
   ConsoleCommandCompilation.cc
+  ConsoleCommandIncludes.cc
   ConsoleCommandManager.cc
   Executor.cc

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

@@ -84 +84 @@
             this->executor_ = executor;
 
-        ConsoleCommandManager::registerCommand(group, name, this);
+        this->names_.push_back(CommandName(group, name));
     }
 
@@ -100 +100 @@
     ConsoleCommand& ConsoleCommand::addShortcut()
     {
-        ConsoleCommandManager::registerCommand("", this->baseName_, this);
+        this->names_.push_back(CommandName("", this->baseName_));
         return *this;
     }
@@ -109 +109 @@
     ConsoleCommand& ConsoleCommand::addShortcut(const std::string&  name)
     {
-        ConsoleCommandManager::registerCommand("", name, this);
+        this->names_.push_back(CommandName("", name));
         return *this;
     }
@@ -118 +118 @@
     ConsoleCommand& ConsoleCommand::addGroup(const std::string& group)
     {
-        ConsoleCommandManager::registerCommand(group, this->baseName_, this);
+        this->names_.push_back(CommandName(group, this->baseName_));
         return *this;
     }
@@ -127 +127 @@
     ConsoleCommand& ConsoleCommand::addGroup(const std::string& group, const std::string&  name)
     {
-        ConsoleCommandManager::registerCommand(group, name, this);
+        this->names_.push_back(CommandName(group, name));
         return *this;
     }

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

@@ -104 +104 @@
 
         public:
+            /**
+             * @brief Defines the name of a command, consisting of an optional group ("" means no group) and the name itself.
+             */
+            struct CommandName
+            {
+                CommandName(const std::string& group, const std::string& name) : group_(group), name_(name) {}
+                std::string group_;
+                std::string name_;
+            };
+
             /**
                 @brief Helper class that is used to manipulate console commands.
@@ -360 +370 @@
                 { return this; }
 
+            inline const std::vector<CommandName>& getNames()
+                { return this->names_; }
+
         private:
             void init(const std::string& group, const std::string& name, const ExecutorPtr& executor, bool bInitialized);
@@ -383 +396 @@
             AccessLevel::Enum accessLevel_;                                 ///< The access level (the state of the game in which you can access the command)
             std::string baseName_;                                          ///< The name that was first assigned to the command
+            std::vector<CommandName> names_;                                ///< All names and aliases of this command
             FunctorPtr baseFunctor_;                                        ///< The functor that defines the header of the command-function
 

code/branches/core7/src/libraries/core/command/ConsoleCommandIncludes.h

@@ -223 +223 @@
 #include "ConsoleCommandManager.h"
 #include "util/VA_NARGS.h"
+#include "core/module/StaticallyInitializedInstance.h"
 
 
@@ -264 +265 @@
 /// Internal macro
 #define SetConsoleCommandGeneric(group, name, functor) \
-    static orxonox::ConsoleCommand& BOOST_PP_CAT(__consolecommand_, __UNIQUE_NUMBER__) = (*new orxonox::ConsoleCommand(group, name, orxonox::createExecutor(functor)))
+    static orxonox::ConsoleCommand& BOOST_PP_CAT(__consolecommand_, __UNIQUE_NUMBER__) \
+        = (new orxonox::SI_CC(new orxonox::ConsoleCommand(group, name, orxonox::createExecutor(functor))))->getCommand()
 
 
@@ -299 +301 @@
 /// Internal macro
 #define DeclareConsoleCommandGeneric(group, name, functor) \
-    static orxonox::ConsoleCommand& BOOST_PP_CAT(__consolecommand_, __UNIQUE_NUMBER__) = (*new orxonox::ConsoleCommand(group, name, orxonox::createExecutor(functor), false))
+    static orxonox::ConsoleCommand& BOOST_PP_CAT(__consolecommand_, __UNIQUE_NUMBER__) \
+        = (new orxonox::SI_CC(new orxonox::ConsoleCommand(group, name, orxonox::createExecutor(functor), false)))->getCommand()
 
 
 namespace orxonox
 {
+    class _CoreExport StaticallyInitializedConsoleCommand : public StaticallyInitializedInstance
+    {
+        public:
+            StaticallyInitializedConsoleCommand(ConsoleCommand* command) : command_(command) {}
+
+            virtual void load();
+
+            inline ConsoleCommand& getCommand()
+                { return *this->command_; }
+
+        private:
+            ConsoleCommand* command_;
+    };
+
+    typedef StaticallyInitializedConsoleCommand SI_CC;
+
     /**
         @brief Returns a manipulator for a command with the given name.