Changeset 1334

Timestamp:

May 20, 2008, 1:48:40 AM (16 years ago)

Author:

landauf

Message:

• added colored output in the InGameConsole, depending on the output level (error = red, …).
• increased performance of InGameConsole and Shell

Location:

code/branches/console/src

Files:

• core/InputBuffer.cc (modified) (1 diff)
• core/OutputBuffer.cc (modified) (2 diffs)
• core/Script.cc (modified) (1 diff)
• core/Shell.cc (modified) (4 diffs)
• core/Shell.h (modified) (3 diffs)
• orxonox/Orxonox.cc (modified) (3 diffs)
• orxonox/Orxonox.h (modified) (1 diff)
• orxonox/console/InGameConsole.cc (modified) (8 diffs)

code/branches/console/src/core/InputBuffer.cc

@@ -163 +163 @@
     bool InputBuffer::keyPressed(const OIS::KeyEvent &e)
     {
+        if (this->keyboard_->isModifierDown(OIS::Keyboard::Alt) && e.key == OIS::KC_TAB)
+            return true;
+
         for (std::list<InputBufferListenerTuple>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); ++it)
         {

code/branches/console/src/core/OutputBuffer.cc

@@ -78 +78 @@
 
         bool eof = this->stream_.eof();
+        bool fail = this->stream_.fail();
 
         if (eof)
@@ -85 +86 @@
         }
 
-        return (!eof);
+        return (!eof && !fail);
     }
 

code/branches/console/src/core/Script.cc

@@ -68 +68 @@
     output_ += str;
 //    COUT(4) << "Lua_output!:" << std::endl << str << std::endl << "***" << std::endl;
-    COUT(5) << str << std::endl;
+    COUT(5) << str;
   }
 

code/branches/console/src/core/Shell.cc

@@ -48 +48 @@
         this->historyOffset_ = 0;
         this->finishedLastLine_ = true;
+        this->bAddOutputLevel_ = false;
 
         this->clearLines();
@@ -131 +132 @@
     }
 
-    void Shell::addLine(const std::string& line, unsigned int level)
+    void Shell::addLine(const std::string& line, int level)
     {
         int original_level = OutputHandler::getOutStream().getOutputLevel();
@@ -196 +197 @@
             if (this->finishedLastLine_)
             {
+                if (this->bAddOutputLevel_)
+                    output.insert(0, 1, (char)OutputHandler::getOutStream().getOutputLevel());
+
                 this->lines_.insert(this->lines_.begin(), output);
 
@@ -239 +243 @@
     void Shell::hintandcomplete()
     {
-        this->addLine(CommandExecutor::hint(this->inputBuffer_.get()), 0);
+        this->addLine(CommandExecutor::hint(this->inputBuffer_.get()), -1);
         this->inputBuffer_.set(CommandExecutor::complete(this->inputBuffer_.get()));
 

code/branches/console/src/core/Shell.h

@@ -83 +83 @@
             std::list<std::string>::const_iterator getEndIterator() const;
 
-            void addLine(const std::string& line, unsigned int level);
+            void addLine(const std::string& line, int level);
             void clearLines();
 
@@ -90 +90 @@
             inline unsigned int getScrollPosition() const
                 { return this->scrollPosition_; }
+
+            inline void addOutputLevel(bool bAddOutputLevel)
+                { this->bAddOutputLevel_ = bAddOutputLevel; }
 
         private:
@@ -127 +130 @@
             unsigned int historyPosition_;
             unsigned int historyOffset_;
+            bool bAddOutputLevel_;
     };
 }

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

@@ -88 +88 @@
   ConsoleCommand(Orxonox, slomo, AccessLevel::Offline, true).setDefaultValue(0, 1.0);
   ConsoleCommand(Orxonox, setTimeFactor, AccessLevel::Offline, false).setDefaultValue(0, 1.0);
-/*
-  class Testconsole : public InputBufferListener
-  {
-    public:
-      Testconsole(InputBuffer* ib) : ib_(ib) {}
-      void listen() const
-      {
-        std::cout << "> " << this->ib_->get() << std::endl;
-      }
-      void execute() const
-      {
-        std::cout << ">> " << this->ib_->get() << std::endl;
-        if (!CommandExecutor::execute(this->ib_->get()))
-          std::cout << "Error" << std::endl;
-        this->ib_->clear();
-      }
-      void hintandcomplete() const
-      {
-        std::cout << CommandExecutor::hint(this->ib_->get()) << std::endl;
-        this->ib_->set(CommandExecutor::complete(this->ib_->get()));
-      }
-      void clear() const
-      {
-        this->ib_->clear();
-      }
-      void removeLast() const
-      {
-        this->ib_->removeBehindCursor();
-      }
-      void exit() const
-      {
-        CommandExecutor::execute("setInputMode 2");
-      }
-
-    private:
-      InputBuffer* ib_;
-  };
-*/
+
   class Calculator
   {
@@ -421 +384 @@
   void Orxonox::startRenderLoop()
   {
-
-//    InputBuffer* ib = new InputBuffer();
-//    InputManager::getSingleton().feedInputBuffer(ib);
-    /*
-    Testconsole* console = new Testconsole(ib);
-    ib->registerListener(console, &Testconsole::listen, true);
-    ib->registerListener(console, &Testconsole::execute, '\r', false);
-    ib->registerListener(console, &Testconsole::hintandcomplete, '\t', true);
-    ib->registerListener(console, &Testconsole::clear, '§', true);
-    ib->registerListener(console, &Testconsole::removeLast, '\b', true);
-    ib->registerListener(console, &Testconsole::exit, (char)0x1B, true);
-    */
-    /*
-    orxonoxConsole_ = new InGameConsole(ib);
-    ib->registerListener(orxonoxConsole_, &InGameConsole::listen, true);
-    ib->registerListener(orxonoxConsole_, &InGameConsole::execute, '\r', false);
-    ib->registerListener(orxonoxConsole_, &InGameConsole::hintandcomplete, '\t', true);
-    ib->registerListener(orxonoxConsole_, &InGameConsole::clear, '§', true);
-    ib->registerListener(orxonoxConsole_, &InGameConsole::removeLast, '\b', true);
-    ib->registerListener(orxonoxConsole_, &InGameConsole::exit, (char)0x1B, true);
-    */
     // first check whether ogre root object has been created
     if (Ogre::Root::getSingletonPtr() == 0)
@@ -490 +432 @@
       for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
         it->tick((float)evt.timeSinceLastFrame * this->timefactor_);
-//      orxonoxConsole_->tick((float)evt.timeSinceLastFrame * this->timefactor_);
 
       // don't forget to call _fireFrameStarted in ogre to make sure

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

@@ -105 +105 @@
       // TODO: make this a config-value by creating a config class for orxonox
       float                 frameSmoothingTime_;
-//      InGameConsole*        orxonoxConsole_;
       HUD*                  orxonoxHUD_;
       bool                  bAbort_;        //!< aborts the render loop if true

code/branches/console/src/orxonox/console/InGameConsole.cc

@@ -45 +45 @@
 #include "GraphicsEngine.h"
 
-#define LINES 20
+#define LINES 30
 
 namespace orxonox
@@ -72 +72 @@
         this->setConfigValues();
 
-        Shell::getInstance().registerListener(this);
+        Shell::getInstance().addOutputLevel(true);
     }
 
@@ -139 +139 @@
     void InGameConsole::lineAdded()
     {
-        this->linesChanged();
         for (unsigned int i = LINES - 1; i > 1; --i)
+        {
             this->consoleOverlayTextAreas_[i]->setCaption(this->consoleOverlayTextAreas_[i - 1]->getCaption());
+            this->consoleOverlayTextAreas_[i]->setColourTop(this->consoleOverlayTextAreas_[i - 1]->getColourTop());
+            this->consoleOverlayTextAreas_[i]->setColourBottom(this->consoleOverlayTextAreas_[i - 1]->getColourBottom());
+        }
 
         this->onlyLastLineChanged();
@@ -214 +217 @@
             this->consoleOverlayTextAreas_[i]->setMetricsMode(Ogre::GMM_PIXELS);
             this->consoleOverlayTextAreas_[i]->setFontName("Console");
-            this->consoleOverlayTextAreas_[i]->setCharHeight(20);
+            this->consoleOverlayTextAreas_[i]->setCharHeight(18);
             this->consoleOverlayTextAreas_[i]->setParameter("colour_top", "0.21 0.69 0.21");
             this->consoleOverlayTextAreas_[i]->setLeft(8);
@@ -267 +270 @@
                 this->consoleOverlay_->hide();
                 this->active_ = false;
+                Shell::getInstance().unregisterListener(this);
             }
             if (top >= 0)
@@ -311 +315 @@
         {
             this->consoleOverlayTextAreas_[i]->setWidth((int) this->windowW_ * InGameConsole::REL_WIDTH);
-            this->consoleOverlayTextAreas_[i]->setTop((int) this->windowH_ * InGameConsole::REL_HEIGHT - 24 - 16*i);
+            this->consoleOverlayTextAreas_[i]->setTop((int) this->windowH_ * InGameConsole::REL_HEIGHT - 24 - 14*i);
         }
     }
@@ -320 +324 @@
     void InGameConsole::activate()
     {
+        Shell::getInstance().registerListener(this);
         this->linesChanged();
 
@@ -362 +367 @@
     void InGameConsole::print(const std::string& text, int index)
     {
+        char level = 0;
+        if (text.size() > 0)
+            level = text[0];
+
+        std::string output = text;
+
+        if (level >= -1 && level <= 5)
+            output.erase(0, 1);
+
         if (LINES > index)
-            this->consoleOverlayTextAreas_[index]->setCaption(convert2UTF(text));
+        {
+            if (level == -1)
+            {
+                this->consoleOverlayTextAreas_[index]->setColourTop   (ColourValue(0.90, 0.90, 0.90, 1.00));
+                this->consoleOverlayTextAreas_[index]->setColourBottom(ColourValue(1.00, 1.00, 1.00, 1.00));
+            }
+            else if (level == 1)
+            {
+                this->consoleOverlayTextAreas_[index]->setColourTop   (ColourValue(0.95, 0.25, 0.25, 1.00));
+                this->consoleOverlayTextAreas_[index]->setColourBottom(ColourValue(1.00, 0.50, 0.50, 1.00));
+            }
+            else if (level == 2)
+            {
+                this->consoleOverlayTextAreas_[index]->setColourTop   (ColourValue(0.95, 0.50, 0.20, 1.00));
+                this->consoleOverlayTextAreas_[index]->setColourBottom(ColourValue(1.00, 0.70, 0.50, 1.00));
+            }
+            else if (level == 3)
+            {
+                this->consoleOverlayTextAreas_[index]->setColourTop   (ColourValue(0.25, 0.25, 0.75, 1.00));
+                this->consoleOverlayTextAreas_[index]->setColourBottom(ColourValue(0.80, 0.80, 1.00, 1.00));
+            }
+            else if (level == 4)
+            {
+                this->consoleOverlayTextAreas_[index]->setColourTop   (ColourValue(0.65, 0.48, 0.44, 1.00));
+                this->consoleOverlayTextAreas_[index]->setColourBottom(ColourValue(1.00, 0.90, 0.90, 1.00));
+            }
+            else if (level == 5)
+            {
+                this->consoleOverlayTextAreas_[index]->setColourTop   (ColourValue(0.40, 0.20, 0.40, 1.00));
+                this->consoleOverlayTextAreas_[index]->setColourBottom(ColourValue(0.80, 0.60, 0.80, 1.00));
+            }
+            else
+            {
+                this->consoleOverlayTextAreas_[index]->setColourTop   (ColourValue(0.21, 0.69, 0.21, 1.00));
+                this->consoleOverlayTextAreas_[index]->setColourBottom(ColourValue(0.80, 1.00, 0.80, 1.00));
+            }
+
+            this->consoleOverlayTextAreas_[index]->setCaption(convert2UTF(output));
+        }
     }