Changeset 2890

Timestamp:

Apr 2, 2009, 8:42:11 PM (16 years ago)

Author:

landauf

Message:

• Added overlay element for the Pong Gametype
• Changed the type of the overlay's owner to BaseObject (former ControllableEntity) to allow other classes to own an overlay (for example a Gametype)
• OverlayGroup does now use a std::set instead of a std::map to store it's overlay elements. Therefore a name is not anymore compulsory for an overlay element.

Location:

code/trunk/src/orxonox

Files:

• objects/gametypes/Gametype.cc (modified) (1 diff)
• objects/gametypes/Gametype.h (modified) (1 diff)
• objects/gametypes/Pong.cc (modified) (2 diffs)
• objects/gametypes/Pong.h (modified) (1 diff)
• objects/infos/HumanPlayer.cc (modified) (2 diffs)
• overlays/OrxonoxOverlay.h (modified) (3 diffs)
• overlays/OverlayGroup.cc (modified) (6 diffs)
• overlays/OverlayGroup.h (modified) (3 diffs)
• overlays/hud/CMakeLists.txt (modified) (1 diff)
• overlays/hud/PongScore.cc (added)
• overlays/hud/PongScore.h (added)

code/trunk/src/orxonox/objects/gametypes/Gametype.cc

@@ -229 +229 @@
         if (it != this->players_.end())
             it->second.frags_++;
+    }
+
+    int Gametype::getScore(PlayerInfo* player) const
+    {
+        std::map<PlayerInfo*, Player>::const_iterator it = this->players_.find(player);
+        if (it != this->players_.end())
+            return it->second.frags_;
+        else
+            return 0;
     }
 

code/trunk/src/orxonox/objects/gametypes/Gametype.h

@@ -107 +107 @@
                 { return this->players_; }
 
+            int getScore(PlayerInfo* player) const;
+
             inline void registerSpawnPoint(SpawnPoint* spawnpoint)
                 { this->spawnpoints_.insert(spawnpoint); }

code/trunk/src/orxonox/objects/gametypes/Pong.cc

@@ -53 +53 @@
         this->bat_[0] = 0;
         this->bat_[1] = 0;
+
+        this->setHUDTemplate("PongHUD");
 
         this->starttimer_.setTimer(1.0, false, this, createExecutor(createFunctor(&Pong::startBall)));
@@ -181 +183 @@
             this->ball_->setSpeed(this->center_->getBallSpeed());
     }
+
+    PlayerInfo* Pong::getLeftPlayer() const
+    {
+        if (this->bat_ && this->bat_[0])
+            return this->bat_[0]->getPlayer();
+        else
+            return 0;
+    }
+
+    PlayerInfo* Pong::getRightPlayer() const
+    {
+        if (this->bat_ && this->bat_[1])
+            return this->bat_[1]->getPlayer();
+        else
+            return 0;
+    }
 }

code/trunk/src/orxonox/objects/gametypes/Pong.h

@@ -53 +53 @@
                 { this->center_ = center; }
 
+            PlayerInfo* getLeftPlayer() const;
+            PlayerInfo* getRightPlayer() const;
+
         protected:
             void startBall();

code/trunk/src/orxonox/objects/infos/HumanPlayer.cc

@@ -173 +173 @@
         if (this->humanHud_)
             this->humanHud_->setOwner(this->getControllableEntity());
-
-        if (this->gametypeHud_)
-            this->gametypeHud_->setOwner(this->getControllableEntity());
     }
 
@@ -206 +203 @@
             this->gametypeHud_ = new OverlayGroup(this);
             this->gametypeHud_->addTemplate(this->gametypeHudTemplate_);
-            this->gametypeHud_->setOwner(this->getControllableEntity());
+            this->gametypeHud_->setOwner(this->getGametype());
         }
     }

code/trunk/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() {}
@@ -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/trunk/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)
     {
-        if (hudElements_.find(element->getName()) != hudElements_.end())
-        {
-            COUT(1) << "Ambiguous names encountered while load the HUD overlays" << std::endl;
-        }
-        else
-        {
-            hudElements_[element->getName()] = element;
-            element->setVisible(this->isVisible());
-            if (this->owner_)
-                element->setOwner(this->owner_);
-        }
+        hudElements_.insert(element);
+        element->setVisible(this->isVisible());
+        if (this->owner_)
+            element->setOwner(this->owner_);
     }
 
@@ -125 +118 @@
         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
@@ -137 +130 @@
     void OverlayGroup::changedVisibility()
     {
-        for (std::map<std::string, OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
-            (*it).second->setVisible(this->isVisible());
+        for (std::set<OrxonoxOverlay*>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
+            (*it)->setVisible(this->isVisible());
     }
 
-    void OverlayGroup::setOwner(ControllableEntity* owner)
+    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/trunk/src/orxonox/overlays/OverlayGroup.h

@@ -37 +37 @@
 #include "OrxonoxPrereqs.h"
 
-#include <map>
+#include <set>
 #include <OgrePrerequisites.h>
 #include "core/BaseObject.h"
@@ -64 +64 @@
         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_; }
 
@@ -89 +89 @@
 
     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/trunk/src/orxonox/overlays/hud/CMakeLists.txt

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