Changeset 993 for code/branches

Timestamp:

Apr 5, 2008, 3:40:10 AM (17 years ago)

Author:

landauf

Message:

• added exit command: quits orxonox (no, it's not a hidden segfault )
• added exec command: executes files (that contain other commands)

funny: use the log function to write commands into orxonox.log and then use 'exec orxonox.log' - it works. I've even added a recursion-blocker to avoid an (almost) endless loop after logging 'exec orxonox.log'

I'm currently thinking about more complex commands (what about delayed commands? or commands with returnvalue and a pipeline symbol?).

Location:

code/branches/core2/src/orxonox

Files:

• GraphicsEngine.cc (modified) (7 diffs)
• Orxonox.cc (modified) (4 diffs)
• Orxonox.h (modified) (2 diffs)
• core/CommandExecutor.cc (modified) (1 diff)
• core/CommandExecutor.h (modified) (1 diff)
• core/ConsoleCommand.h (modified) (1 diff)
• core/CorePrereqs.h (modified) (1 diff)

code/branches/core2/src/orxonox/GraphicsEngine.cc

@@ -42 +42 @@
 namespace orxonox {
 
-  using namespace Ogre;
-
   GraphicsEngine::GraphicsEngine()
   {
@@ -71 +69 @@
     std::string plugin_filename = "plugins.cfg";
 #endif
-    root_ = new Root(plugin_filename);
+    root_ = new Ogre::Root(plugin_filename);
   }
 
@@ -77 +75 @@
    * @return scene manager
    */
-  SceneManager* GraphicsEngine::getSceneManager()
+  Ogre::SceneManager* GraphicsEngine::getSceneManager()
   {
     if(!scene_)
     {
-      scene_ = root_->createSceneManager(ST_GENERIC, "Default SceneManager");
+      scene_ = root_->createSceneManager(Ogre::ST_GENERIC, "Default SceneManager");
       COUT(3) << "Info: Created SceneMan: " << scene_ << std::endl;
     }
@@ -98 +96 @@
   {
     root_->initialise(true, "OrxonoxV2");
-    TextureManager::getSingleton().setDefaultNumMipmaps(5);
-    ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+    Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(5);
+    Ogre::ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
   }
 
@@ -107 +105 @@
     //TODO: Work with ressource groups (should be generated by a special loader)
     // Load resource paths from data file using configfile ressource type
-    ConfigFile cf;
+    Ogre::ConfigFile cf;
     cf.load(dataPath + "resources.cfg");
 
     // Go through all sections & settings in the file
-    ConfigFile::SectionIterator seci = cf.getSectionIterator();
+    Ogre::ConfigFile::SectionIterator seci = cf.getSectionIterator();
 
     std::string secName, typeName, archName;
@@ -117 +115 @@
     {
       secName = seci.peekNextKey();
-      ConfigFile::SettingsMultiMap *settings = seci.getNext();
-      ConfigFile::SettingsMultiMap::iterator i;
+      Ogre::ConfigFile::SettingsMultiMap *settings = seci.getNext();
+      Ogre::ConfigFile::SettingsMultiMap::iterator i;
       for (i = settings->begin(); i != settings->end(); ++i)
       {
@@ -124 +122 @@
         archName = i->second; // name (and location) of archive
 
-        ResourceGroupManager::getSingleton().addResourceLocation(
+        Ogre::ResourceGroupManager::getSingleton().addResourceLocation(
                                            std::string(dataPath + archName),
                                            typeName, secName);

code/branches/core2/src/orxonox/Orxonox.cc

@@ -86 +86 @@
 #include "objects/test3.h"
 
+#include "core/ConsoleCommand.h"
 #include "core/CommandExecutor.h"
 #include "core/InputBuffer.h"
@@ -93 +94 @@
 namespace orxonox
 {
+    ConsoleCommandShortcut(Orxonox, exit, AccessLevel::None);
+
     class Testlistener : public InputBufferListener
     {
@@ -150 +153 @@
 
         mKeyboard->capture();
-        return !mKeyboard->isKeyDown(OIS::KC_ESCAPE);
+        return (!mKeyboard->isKeyDown(OIS::KC_ESCAPE) && !Orxonox::getSingleton()->shouldExit());
       }
 /*
@@ -185 +188 @@
     this->frameListener_ = 0;
     this->root_ = 0;
+    this->bExit_ = false;
   }
 

code/branches/core2/src/orxonox/Orxonox.h

@@ -45 +45 @@
       inline OIS::Mouse* getMouse()                        { return this->mouse_; }
 //      inline BulletManager* getBulletMgr()                 { return this->bulletMgr_; }
+      static inline void exit()                            { Orxonox::getSingleton()->bExit_ = true; }
+      inline bool shouldExit()                             { return this->bExit_; }
 
     private:
@@ -78 +80 @@
       OrxListener*          frameListener_;
       Ogre::Root*           root_;
+      bool                  bExit_;
 
       // this is used to identify the mode (server/client/...) we're in

code/branches/core2/src/orxonox/core/CommandExecutor.cc

@@ -45 +45 @@
     ConsoleCommandShortcutGeneric(keyword3, createExecutor((FunctorStatic*)0, "bind", AccessLevel::User));
 
+    ConsoleCommandShortcutExtern(exec, AccessLevel::None);
+
+    void exec(const std::string& filename)
+    {
+        static std::set<std::string> executingFiles;
+
+        std::set<std::string>::const_iterator it = executingFiles.find(filename);
+        if (it != executingFiles.end())
+        {
+            COUT(1) << "Error: Recurring exec command in \"" << filename << "\". Stopped execution." << std::endl;
+            return;
+        }
+
+        // Open the file
+        std::ifstream file;
+        file.open(filename.c_str(), std::fstream::in);
+
+        if (!file.is_open())
+        {
+            COUT(1) << "Error: Couldn't execute file \"" << filename << "\"." << std::endl;
+            return;
+        }
+
+        executingFiles.insert(filename);
+
+        // Iterate through the file and put the lines into the CommandExecutor
+        char line[1024];
+        while (file.good() && !file.eof())
+        {
+            file.getline(line, 1024);
+            CommandExecutor::execute(line);
+        }
+
+        executingFiles.erase(filename);
+    }
+
 
     ///////////////////////

code/branches/core2/src/orxonox/core/CommandExecutor.h

@@ -60 +60 @@
         CS_Error
     };
+
+    void exec(const std::string& filename);
 
     enum KeybindMode {}; // temporary

code/branches/core2/src/orxonox/core/ConsoleCommand.h

@@ -43 +43 @@
 
 
-#define ConsoleCommandShortcut(function, accesslevel) \
+#define ConsoleCommandShortcut(classname, function, accesslevel) \
     ConsoleCommandShortcutGeneric(function##consolecommand__, orxonox::createExecutor(orxonox::createFunctor(&classname::function), #function, accesslevel))
+
+#define ConsoleCommandShortcutExtern(function, accesslevel) \
+    ConsoleCommandShortcutGeneric(function##consolecommand__, orxonox::createExecutor(orxonox::createFunctor(&function), #function, accesslevel))
 
 #define ConsoleCommandShortcutGeneric(fakevariable, executor) \

code/branches/core2/src/orxonox/core/CorePrereqs.h

@@ -93 +93 @@
   class CommandEvaluation;
   class CommandExecutor;
+  class ConfigFile;
+  class ConfigFileEntry;
+  class ConfigFileEntryComment;
+  class ConfigFileEntryValue;
+  class ConfigFileManager;
+  class ConfigFileSection;
   class ConfigValueContainer;
   class DebugLevel;