Changeset 1633 for code/trunk

Timestamp:

Jun 29, 2008, 6:45:53 PM (16 years ago)

Author:

rgrieder

Message:

• added font generation for the console (so that we can create the exact font size, looks sharper)
• fixed 2 bugs with the size of an OrxonoxOverlay
• fixed a bug with the visibility of entire OverlayGroups

Location:

code/trunk/src/orxonox/overlays

Files:

• OrxonoxOverlay.cc (modified) (1 diff)
• OrxonoxOverlay.h (modified) (1 diff)
• OverlayGroup.cc (modified) (1 diff)
• OverlayGroup.h (modified) (1 diff)
• console/InGameConsole.cc (modified) (4 diffs)

code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -122 +122 @@
 
         XMLPortParam(OrxonoxOverlay, "size",      setSize,      getSize,      xmlElement, mode)
-            .defaultValues(Vector2(0.5f, 0.5f));
+            .defaultValues(Vector2(1.0f, 1.0f));
         XMLPortParam(OrxonoxOverlay, "pickPoint", setPickPoint, getPickPoint, xmlElement, mode)
             .defaultValues(Vector2(0.0f, 0.0f));

code/trunk/src/orxonox/overlays/OrxonoxOverlay.h

@@ -132 +132 @@
 
         //! Gets the current size that was set (uncorrected)
-        Vector2 getSize() const                   { return this->size_ * this->sizeCorrection_; }
+        const Vector2& getSize() const                   { return this->size_; }
 
         //! Gets the actual size of the overlay on the screen (corrected)
-        const Vector2& getActualSize() const      { return this->size_; }
+        Vector2 getActualSize() const      { return this->size_ * this->sizeCorrection_; }
 
         //! Gets the current size correction (default: 1.0, 1.0)

code/trunk/src/orxonox/overlays/OverlayGroup.cc

@@ -116 +116 @@
     }
 
+    //! Changes the visibility of all elements
+    void OverlayGroup::changedVisibility()
+    {
+        for (std::map<std::string, OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+            (*it).second->setVisible(this->isVisible());
+    }
+
 
     //########### Console commands ############

code/trunk/src/orxonox/overlays/OverlayGroup.h

@@ -80 +80 @@
         OrxonoxOverlay* getElement(unsigned int index);
 
+        void changedVisibility();
+
         std::map<std::string, OrxonoxOverlay*> hudElements_;    //!< Contains all the OrxonoxOverlays of the this group.
         Vector2 scale_;                                         //!< Current scale (independant of the elements).

code/trunk/src/orxonox/overlays/console/InGameConsole.cc

@@ -36 +36 @@
 #include <OgreOverlayManager.h>
 #include <OgreOverlayContainer.h>
-#include <OgreStringConverter.h>
-
+#include <OgreFontManager.h>
+#include <OgreFont.h>
+
+#include "util/Math.h"
+#include "util/Convert.h"
 #include "core/Debug.h"
 #include "core/CoreIncludes.h"
@@ -43 +46 @@
 #include "core/ConsoleCommand.h"
 #include "core/input/InputManager.h"
-#include "util/Math.h"
 #include "GraphicsEngine.h"
 
@@ -136 +138 @@
         this->consoleOverlayContainer_->addChild(this->consoleOverlayBorder_);
 
+        // create a new font to match the requested size exactly
+        Ogre::FontPtr font = static_cast<Ogre::FontPtr>
+            (Ogre::FontManager::getSingleton().create("MonofurConsole", "General"));
+        font->setType(Ogre::FT_TRUETYPE);
+        font->setSource("Monofur.ttf");
+        font->setTrueTypeSize(18);
+        // reto: I don't know why, but setting the resolution twice as high makes the font look a lot clearer
+        font->setTrueTypeResolution(192);
+        font->addCodePointRange(Ogre::Font::CodePointRange(33, 126));
+        font->addCodePointRange(Ogre::Font::CodePointRange(161, 255));
+
         // create the text lines
         this->consoleOverlayTextAreas_ = new Ogre::TextAreaOverlayElement*[LINES];
         for (int i = 0; i < LINES; i++)
         {
-            this->consoleOverlayTextAreas_[i] = static_cast<Ogre::TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "InGameConsoleTextArea" + Ogre::StringConverter::toString(i)));
+            this->consoleOverlayTextAreas_[i] = static_cast<Ogre::TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "InGameConsoleTextArea" + convertToString(i)));
             this->consoleOverlayTextAreas_[i]->setMetricsMode(Ogre::GMM_PIXELS);
-            this->consoleOverlayTextAreas_[i]->setFontName("Monofur");
+            this->consoleOverlayTextAreas_[i]->setFontName("MonofurConsole");
             this->consoleOverlayTextAreas_[i]->setCharHeight(18);
             this->consoleOverlayTextAreas_[i]->setParameter("colour_top", "0.21 0.69 0.21");
@@ -153 +166 @@
         this->consoleOverlayCursor_ = static_cast<Ogre::TextAreaOverlayElement*>(ovMan->createOverlayElement("TextArea", "InGameConsoleCursor"));
         this->consoleOverlayCursor_->setMetricsMode(Ogre::GMM_PIXELS);
-        this->consoleOverlayCursor_->setFontName("Monofur");
+        this->consoleOverlayCursor_->setFontName("MonofurConsole");
         this->consoleOverlayCursor_->setCharHeight(18);
         this->consoleOverlayCursor_->setParameter("colour_top", "0.21 0.69 0.21");