Changeset 2907 for code/branches/questsystem5/src/orxonox/overlays

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/OrxonoxOverlay.cc (modified) (4 diffs)
• src/orxonox/overlays/OrxonoxOverlay.h (modified) (4 diffs)
• src/orxonox/overlays/OverlayGroup.cc (modified) (6 diffs)
• src/orxonox/overlays/OverlayGroup.h (modified) (3 diffs)
• src/orxonox/overlays/console/InGameConsole.cc (modified) (7 diffs)
• src/orxonox/overlays/console/InGameConsole.h (modified) (2 diffs)
• src/orxonox/overlays/debug/DebugFPSText.cc (modified) (2 diffs)
• src/orxonox/overlays/debug/DebugRTRText.cc (modified) (2 diffs)
• src/orxonox/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/hud/HUDRadar.cc (modified) (1 diff)
• src/orxonox/overlays/hud/PongScore.cc (added)
• src/orxonox/overlays/hud/PongScore.h (added)
• src/orxonox/overlays/notifications/NotificationQueue.cc (modified) (2 diffs)

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

@@ -39 +39 @@
 #include <OgreOverlayManager.h>
 #include <OgrePanelOverlayElement.h>
+#include <OgreRenderWindow.h>
+
 #include "util/Convert.h"
 #include "util/Exception.h"
 #include "util/String.h"
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "core/ConsoleCommand.h"
+#include "GraphicsManager.h"
 
 namespace orxonox
@@ -64 +67 @@
         this->group_ = 0;
 
-        if (!Core::showsGraphics())
+        if (!GameMode::showsGraphics())
             ThrowException(NoGraphics, "Can't create OrxonoxOverlay, graphics engine not initialized");
 
@@ -77 +80 @@
         this->overlay_->add2D(this->background_);
 
-        // We'll have to set the aspect ratio to a default value first.
-        // GSGraphics gets informed about our construction here and can update us in the next tick.
-        this->windowAspectRatio_ = 1.0;
+        // Get aspect ratio from the render window. Later on, we get informed automatically
+        Ogre::RenderWindow* defaultWindow = GraphicsManager::getInstance().getRenderWindow();
+        this->windowAspectRatio_ = (float)defaultWindow->getWidth() / defaultWindow->getHeight();
         this->sizeCorrectionChanged();
 
@@ -175 +178 @@
     /**
     @brief
-        Called by the GraphicsEngine whenever the window size changes.
+        Called by the GraphicsManager whenever the window size changes.
         Calculates the aspect ratio only.
     */
-    void OrxonoxOverlay::windowResized(int newWidth, int newHeight)
+    void OrxonoxOverlay::windowResized(unsigned int newWidth, unsigned int newHeight)
     {
         this->windowAspectRatio_ = newWidth/(float)newHeight;

code/branches/questsystem5/src/orxonox/overlays/OrxonoxOverlay.h

@@ -154 +154 @@
         virtual void changedVisibility();
 
-        inline void setOwner(ControllableEntity* owner)
+        inline void setOwner(BaseObject* owner)
         {
             if (this->owner_ != owner)
@@ -162 +162 @@
             }
         }
-        inline ControllableEntity* getOwner() const
+        inline BaseObject* getOwner() const
             { return this->owner_; }
         virtual void changedOwner() {}
@@ -200 +200 @@
 
     private:
-        void windowResized(int newWidth, int newHeight);
+        void windowResized(unsigned int newWidth, unsigned int newHeight);
 
         static unsigned int hudOverlayCounter_s;   //!< Static counter for hud elements
@@ -206 +206 @@
             We could also use the ObjectList, but that doesn't guarantee XMLPort(.) was called and is slower. */
         static std::map<std::string, OrxonoxOverlay*> overlays_s;
-        ControllableEntity* owner_;
+        BaseObject* owner_;
         OverlayGroup* group_;
   };

code/branches/questsystem5/src/orxonox/overlays/OverlayGroup.cc

@@ -63 +63 @@
     OverlayGroup::~OverlayGroup()
     {
-        for (std::map<std::string, OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            delete it->second;
+        for (std::set<OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+            delete (*it);
     }
 
@@ -83 +83 @@
     }
 
-    //! Scales every element in the map.
+    //! Scales every element in the set.
     void OverlayGroup::setScale(const Vector2& scale)
     {
-        for (std::map<std::string, OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            (*it).second->scale(scale / this->scale_);
+        for (std::set<OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+            (*it)->scale(scale / this->scale_);
         this->scale_ = scale;
     }
 
-    //! Scrolls every element in the map.
+    //! Scrolls every element in the set.
     void OverlayGroup::setScroll(const Vector2& scroll)
     {
-        for (std::map<std::string, OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            (*it).second->scroll(scroll - this->scroll_);
+        for (std::set<OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+            (*it)->scroll(scroll - this->scroll_);
         this->scroll_ = scroll;
     }
@@ -101 +101 @@
     /**
     @brief
-        Adds an element to the map (used when loading with XMLPort).
+        Adds an element to the set (used when loading with XMLPort).
     @remarks
         The names of the OrxonoxOverlays have to be unique!
@@ -107 +107 @@
     void OverlayGroup::addElement(OrxonoxOverlay* element)
     {
-        this->insertElement(element, element->getName());
-    }
-
-        /**
-    @brief
-        Adds an element to the map.
+        hudElements_.insert(element);
+        element->setVisible(this->isVisible());
+        if (this->owner_)
+            element->setOwner(this->owner_);
+    }
+
+    /**
+    @brief
+        Removes an element from the map.
     @param element
-        The element to be added.
-    @param name
-        The name of the element.
-    @remarks
-        The names of the OrxonoxOverlays have to be unique!
-    */
-    void OverlayGroup::insertElement(OrxonoxOverlay* element, const std::string & name)
-    {
-        element->setName(name);
-        if (hudElements_.find(name) != hudElements_.end())
-        {
-            COUT(1) << "Ambiguous names encountered while load the HUD overlays" << std::endl;
-        }
-        else
-        {
-            hudElements_[name] = element;
-            element->setVisible(this->isVisible());
-                        if (this->owner_)
-                element->setOwner(this->owner_);
-        }
-    }
-
-        /**
-    @brief
-        Removes an element from the map.
-    @param name
-        The name of the element that is removed.
+        The element that is to be removed.
     @return
         Returns true if there was such an element to remove, false if not.
     */
-    bool OverlayGroup::removeElement(const std::string & name)
-    {
-        if(this->hudElements_.erase(name) == 0)
+    bool OverlayGroup::removeElement(OrxonoxOverlay* element)
+    {
+        if(this->hudElements_.erase(element) == 0)
             return false;
         return true;
@@ -156 +133 @@
         if (index < this->hudElements_.size())
         {
-            std::map<std::string, OrxonoxOverlay*>::const_iterator it = hudElements_.begin();
+            std::set<OrxonoxOverlay*>::const_iterator it = hudElements_.begin();
             for (unsigned int i = 0; i != index; ++it, ++i)
                 ;
-            return (*it).second;
+            return (*it);
         }
         else
@@ -168 +145 @@
     void OverlayGroup::changedVisibility()
     {
-        for (std::map<std::string, OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            (*it).second->setVisible(this->isVisible());
-    }
-
-    void OverlayGroup::setOwner(ControllableEntity* owner)
+        for (std::set<OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+            (*it)->setVisible(this->isVisible());
+    }
+
+    void OverlayGroup::setOwner(BaseObject* owner)
     {
         this->owner_ = owner;
 
-        for (std::map<std::string, OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            (*it).second->setOwner(owner);
+        for (std::set<OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+            (*it)->setOwner(owner);
     }
 

code/branches/questsystem5/src/orxonox/overlays/OverlayGroup.h

@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
-#include <map>
+#include <set>
+#include <string>
 #include <OgrePrerequisites.h>
 #include "core/BaseObject.h"
@@ -64 +65 @@
         static void scrollGroup(const std::string& name, const Vector2& scroll);
 
-        inline const std::map<std::string, OrxonoxOverlay*>& getOverlays() const
+        inline const std::set<OrxonoxOverlay*>& getOverlays() const
             { return this->hudElements_; }
 
         void changedVisibility();
 
-        void setOwner(ControllableEntity* owner);
-        inline ControllableEntity* getOwner() const
+        void setOwner(BaseObject* owner);
+        inline BaseObject* getOwner() const
             { return this->owner_; }
 
@@ -86 +87 @@
 
         void addElement(OrxonoxOverlay* element);
-                void insertElement(OrxonoxOverlay* element, const std::string & name);
-        bool removeElement(const std::string & name);
+        bool removeElement(OrxonoxOverlay* element);
         OrxonoxOverlay* getElement(unsigned int index);
 
     private:
-        std::map<std::string, OrxonoxOverlay*> hudElements_;    //!< Contains all the OrxonoxOverlays of the this group.
-        Vector2 scale_;                                         //!< Current scale (independent of the elements).
-        Vector2 scroll_;                                        //!< Current scrolling offset.
-        ControllableEntity* owner_;                             //!< The owner of this OverlayGroup
+        std::set<OrxonoxOverlay*> hudElements_;    //!< Contains all the OrxonoxOverlays of the this group.
+        Vector2 scale_;                            //!< Current scale (independent of the elements).
+        Vector2 scroll_;                           //!< Current scrolling offset.
+        BaseObject* owner_;                        //!< The owner of this OverlayGroup
     };
 }

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

@@ -42 +42 @@
 #include "util/Convert.h"
 #include "util/Debug.h"
+#include "core/Clock.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -172 +173 @@
     {
         // create the corresponding input state
-        inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("console", 40);
+        inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("console", false, false, InputStatePriority::Console);
         inputState_->setKeyHandler(Shell::getInstance().getInputBuffer());
         bHidesAllInputChanged();
@@ -347 +348 @@
         @brief Used to control the actual scrolling and the cursor.
     */
-    void InGameConsole::tick(float dt)
+    void InGameConsole::update(const Clock& time)
     {
         if (this->scroll_ != 0)
@@ -358 +359 @@
                 // enlarge oldTop a little bit so that this exponential function
                 // reaches 0 before infinite time has passed...
-                float deltaScroll = (oldTop - 0.01) * dt * this->scrollSpeed_;
+                float deltaScroll = (oldTop - 0.01) * time.getDeltaTime() * this->scrollSpeed_;
                 if (oldTop - deltaScroll >= 0)
                 {
@@ -373 +374 @@
                 // scrolling up
                 // note: +0.01 for the same reason as when scrolling down
-                float deltaScroll = (1.2 * this->relativeHeight + 0.01 + oldTop) * dt * this->scrollSpeed_;
+                float deltaScroll = (1.2 * this->relativeHeight + 0.01 + oldTop) * time.getDeltaTime() * this->scrollSpeed_;
                 if (oldTop - deltaScroll <= -1.2 * this->relativeHeight)
                 {
@@ -388 +389 @@
         if (this->bActive_)
         {
-            this->cursor_ += dt;
+            this->cursor_ += time.getDeltaTime();
             if (this->cursor_ >= this->blinkTime)
             {
@@ -409 +410 @@
         @brief Resizes the console elements. Call if window size changes.
     */
-    void InGameConsole::windowResized(int newWidth, int newHeight)
+    void InGameConsole::windowResized(unsigned int newWidth, unsigned int newHeight)
     {
         this->windowW_ = newWidth;

code/branches/questsystem5/src/orxonox/overlays/console/InGameConsole.h

@@ -53 +53 @@
         void setConfigValues();
 
-        virtual void tick(float dt);
+        void update(const Clock& time);
 
         static InGameConsole& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
@@ -81 +81 @@
         void print(const std::string& text, int index, bool alwaysShift = false);
 
-        void windowResized(int newWidth, int newHeight);
+        void windowResized(unsigned int newWidth, unsigned int newHeight);
 
         // config value related

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

@@ -30 +30 @@
 #include "DebugFPSText.h"
 #include <OgreTextAreaOverlayElement.h>
+#include "util/Convert.h"
 #include "core/CoreIncludes.h"
-#include "GraphicsEngine.h"
-#include "util/Convert.h"
+#include "core/Game.h"
 
 namespace orxonox
@@ -51 +51 @@
         SUPER(DebugFPSText, tick, dt);
 
-        float fps = GraphicsEngine::getInstance().getAverageFramesPerSecond();
+        float fps = Game::getInstance().getAvgFPS();
         this->setCaption(convertToString(fps));
     }

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

@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "util/Convert.h"
-#include "GraphicsEngine.h"
+#include "core/Game.h"
 
 namespace orxonox
@@ -51 +51 @@
         SUPER(DebugRTRText, tick, dt);
 
-        float rtr = GraphicsEngine::getInstance().getAverageTickTime();
+        float rtr = Game::getInstance().getAvgTickTime();
         this->setCaption(convertToString(rtr));
     }

code/branches/questsystem5/src/orxonox/overlays/hud/CMakeLists.txt

@@ -7 +7 @@
   ChatOverlay.cc
   GametypeStatus.cc
+  PongScore.cc
 )

code/branches/questsystem5/src/orxonox/overlays/hud/HUDRadar.cc

@@ -94 +94 @@
     void HUDRadar::displayObject(RadarViewable* object, bool bIsMarked)
     {
-        if (object == (RadarViewable*)this->owner_)
+        if (object == static_cast<RadarViewable*>(this->owner_))
             return;
 

code/branches/questsystem5/src/orxonox/overlays/notifications/NotificationQueue.cc

@@ -410 +410 @@
         this->containers_.insert(container);
         this->overlays_[notification] = container;
-        this->insertElement(container->overlay, container->name);
+        this->addElement(container->overlay);
         this->size_= this->size_+1;
 
@@ -429 +429 @@
             return false;
         
-        this->removeElement(container->name);
+        this->removeElement(container->overlay);
         this->containers_.erase(container);
         this->overlays_.erase(container->notification);