Changeset 2036 for code/branches

Timestamp:

Oct 28, 2008, 10:55:49 PM (16 years ago)

Author:

rgrieder

Message:

Added minimal test files for a statistics overlay.

Location:

code/branches/overlay

Files:

• bin/def_keybindings.ini (modified) (1 diff)
• init/common/def_keybindings.ini (modified) (1 diff)
• src/orxonox/gamestates/GSLevel.cc (modified) (3 diffs)
• src/orxonox/gamestates/GSLevel.h (modified) (1 diff)
• src/orxonox/overlays/OrxonoxOverlay.cc (modified) (2 diffs)
• src/orxonox/overlays/OverlayText.cc (modified) (5 diffs)
• src/orxonox/overlays/OverlayText.h (modified) (3 diffs)
• src/orxonox/overlays/debug/DebugFPSText.cc (modified) (1 diff)
• src/orxonox/overlays/debug/DebugRTRText.cc (modified) (1 diff)
• src/orxonox/overlays/stats (added)
• src/orxonox/overlays/stats/StatsTest.cc (added)
• src/orxonox/overlays/stats/StatsTest.h (added)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)

code/branches/overlay/bin/def_keybindings.ini

@@ -32 +32 @@
 KeyF14=
 KeyF15=
-KeyF2=
+KeyF2="OverlayGroup toggleVisibility Stats"
 KeyF3=
 KeyF4=

code/branches/overlay/init/common/def_keybindings.ini

@@ -32 +32 @@
 KeyF14=
 KeyF15=
-KeyF2=
+KeyF2="OverlayGroup toggleVisibility Stats"
 KeyF3=
 KeyF4=

code/branches/overlay/src/orxonox/gamestates/GSLevel.cc

@@ -58 +58 @@
         , startLevel_(0)
         , hud_(0)
+        , stats_(0)
     {
         RegisterObject(GSLevel);
@@ -93 +94 @@
         hud_ = new Level(Settings::getDataPath() + "overlay/hud.oxo");
         Loader::load(hud_);
+
+        // Load statistics
+        COUT(3) << "Orxonox: Loading statistics overlay" << std::endl;
+        stats_ = new Level(Settings::getDataPath() + "overlay/stats.oxo");
+        Loader::load(stats_);
 
         // reset game speed to normal
@@ -115 +121 @@
         Loader::unload(hud_);
         delete this->hud_;
+
+        Loader::unload(stats_);
+        delete this->stats_;
 
         // this call will delete every BaseObject!

code/branches/overlay/src/orxonox/gamestates/GSLevel.h

@@ -70 +70 @@
         Level*                startLevel_;       //!< current hard coded default level
         Level*                hud_;              //!< 'level' object fo the HUD
+        Level*                stats_;            //!< 'level' object fo the stats overlay
 
         // config values

code/branches/overlay/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -60 +60 @@
     {
         RegisterObject(OrxonoxOverlay);
+
+        // add this overlay to the static map of OrxonoxOverlays
+        if (overlays_s.find(this->getName()) != overlays_s.end())
+        {
+            COUT(1) << "Overlay names should be unique or you cannnot access them via console." << std::endl;
+        }
+        overlays_s[this->getName()] = this;
+
+        // create the Ogre::Overlay
+        overlay_ = Ogre::OverlayManager::getSingleton().create("OrxonoxOverlay_overlay_"
+            + convertToString(hudOverlayCounter_s++));
+
+        // create background panel (can be used to show any picture)
+        this->background_ = static_cast<Ogre::PanelOverlayElement*>(
+            Ogre::OverlayManager::getSingleton().createOverlayElement("Panel",
+            "OrxonoxOverlay_background_" + convertToString(hudOverlayCounter_s++)));
+        this->overlay_->add2D(this->background_);
+
+        // We'll have to get the aspect ratio manually for the first time. Afterwards windowResized() gets
+        // called automatically by the GraphicsEngine.
+        this->windowResized(GraphicsEngine::getInstance().getWindowWidth(),
+            GraphicsEngine::getInstance().getWindowHeight());
+
+        this->changedVisibility();
     }
 
@@ -93 +117 @@
     {
         SUPER(OrxonoxOverlay, XMLPort, xmlElement, mode);
-
-        if (mode == XMLPort::LoadObject)
-        {
-            // add this overlay to the static map of OrxonoxOverlays
-            if (overlays_s.find(this->getName()) != overlays_s.end())
-            {
-                COUT(1) << "Overlay names should be unique or you cannnot access them via console." << std::endl;
-            }
-            overlays_s[this->getName()] = this;
-
-            // create the Ogre::Overlay
-            overlay_ = Ogre::OverlayManager::getSingleton().create("OrxonoxOverlay_overlay_"
-                + convertToString(hudOverlayCounter_s++));
-
-            // create background panel (can be used to show any picture)
-            this->background_ = static_cast<Ogre::PanelOverlayElement*>(
-                Ogre::OverlayManager::getSingleton().createOverlayElement("Panel",
-                "OrxonoxOverlay_background_" + convertToString(hudOverlayCounter_s++)));
-            this->overlay_->add2D(this->background_);
-
-            // We'll have to get the aspect ratio manually for the first time. Afterwards windowResized() gets
-            // called automatically by the GraphicsEngine.
-            this->windowResized(GraphicsEngine::getInstance().getWindowWidth(),
-                GraphicsEngine::getInstance().getWindowHeight());
-
-            this->changedVisibility();
-        }
 
         XMLPortParam(OrxonoxOverlay, "size",      setSize,      getSize,      xmlElement, mode)

code/branches/overlay/src/orxonox/overlays/OverlayText.cc

@@ -31 +31 @@
 
 #include <OgreOverlayManager.h>
-#include <OgreTextAreaOverlayElement.h>
 #include <OgrePanelOverlayElement.h>
 
@@ -46 +45 @@
     {
         RegisterObject(OverlayText);
+
+        this->text_ = static_cast<Ogre::TextAreaOverlayElement*>(Ogre::OverlayManager::getSingleton()
+            .createOverlayElement("TextArea", "OverlayText_text_" + getUniqueNumberStr()));
+        this->text_->setCharHeight(1.0);
+
+        this->background_->addChild(this->text_);
     }
 
     OverlayText::~OverlayText()
     {
-        if (this->text_)
+        if (this->isInitialized())
             Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->text_);
     }
@@ -57 +62 @@
     {
         SUPER(OverlayText, XMLPort, xmlElement, mode);
-
-        if (mode == XMLPort::LoadObject)
-        {
-            this->text_ = static_cast<Ogre::TextAreaOverlayElement*>(Ogre::OverlayManager::getSingleton()
-                .createOverlayElement("TextArea", "OverlayText_text_" + getUniqueNumberStr()));
-            this->text_->setCharHeight(1.0);
-
-            this->background_->addChild(this->text_);
-        }
 
         XMLPortParam(OverlayText, "font",     setFont,     getFont,     xmlElement, mode).defaultValues("Monofur");
@@ -74 +70 @@
     void OverlayText::setFont(const std::string& font)
     {
-        if (this->text_ && font != "")
+        if (font != "")
             this->text_->setFontName(font);
     }
@@ -80 +76 @@
     const std::string& OverlayText::getFont() const
     {
-        if (this->text_)
-            return this->text_->getFontName();
-        else
-            return blankString;
+        return this->text_->getFontName();
     }
 

code/branches/overlay/src/orxonox/overlays/OverlayText.h

@@ -34 +34 @@
 #include <string>
 #include <OgrePrerequisites.h>
+#include <OgreTextAreaOverlayElement.h>
 #include "OrxonoxOverlay.h"
 
@@ -46 +47 @@
         virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
 
-    protected:
-        virtual void sizeChanged();
-
-        void setCaption(const std::string& caption) { this->caption_ = caption; }
-        const std::string& getCaption() const       { return this->caption_; }
+        void setCaption(const std::string& caption) { this->text_->setCaption(caption); }
+        std::string getCaption() const              { return this->text_->getCaption(); }
 
         void setFont(const std::string& font);
@@ -58 +56 @@
         float getTextSize() const    { return this->getSize().y; }
 
-        Ogre::TextAreaOverlayElement* text_;
+    protected:
+        virtual void sizeChanged();
 
     private:
-        std::string caption_;
+
+        Ogre::TextAreaOverlayElement* text_;
     };
 }

code/branches/overlay/src/orxonox/overlays/debug/DebugFPSText.cc

@@ -50 +50 @@
     {
         float fps = GraphicsEngine::getInstance().getAverageFramesPerSecond();
-        this->text_->setCaption(this->getCaption() + convertToString(fps));
+        this->setCaption(convertToString(fps));
     }
 }

code/branches/overlay/src/orxonox/overlays/debug/DebugRTRText.cc

@@ -50 +50 @@
     {
         float rtr = GraphicsEngine::getInstance().getAverageTickTime();
-        this->text_->setCaption(this->getCaption() + convertToString(rtr));
+        this->setCaption(convertToString(rtr));
     }
 }

code/branches/overlay/visual_studio/vc8/orxonox.vcproj

@@ -441 +441 @@
                                         </File>
                                 </Filter>
+                                <Filter
+                                        Name="stats"
+                                        >
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\stats\StatsTest.cc"
+                                                >
+                                        </File>
+                                </Filter>
                         </Filter>
                         <Filter
@@ -748 +756 @@
                                         <File
                                                 RelativePath="..\..\src\orxonox\overlays\debug\DebugRTRText.h"
+                                                >
+                                        </File>
+                                </Filter>
+                                <Filter
+                                        Name="stats"
+                                        >
+                                        <File
+                                                RelativePath="..\..\src\orxonox\overlays\stats\StatsTest.h"
                                                 >
                                         </File>