- Timestamp:
- Apr 8, 2009, 12:36:08 AM (16 years ago)
- Location:
- code/branches/questsystem5
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/questsystem5
- Property svn:mergeinfo changed
-
code/branches/questsystem5/src/orxonox/overlays/OverlayGroup.h
r2779 r2907 37 37 #include "OrxonoxPrereqs.h" 38 38 39 #include <map> 39 #include <set> 40 #include <string> 40 41 #include <OgrePrerequisites.h> 41 42 #include "core/BaseObject.h" … … 64 65 static void scrollGroup(const std::string& name, const Vector2& scroll); 65 66 66 inline const std:: map<std::string,OrxonoxOverlay*>& getOverlays() const67 inline const std::set<OrxonoxOverlay*>& getOverlays() const 67 68 { return this->hudElements_; } 68 69 69 70 void changedVisibility(); 70 71 71 void setOwner( ControllableEntity* owner);72 inline ControllableEntity* getOwner() const72 void setOwner(BaseObject* owner); 73 inline BaseObject* getOwner() const 73 74 { return this->owner_; } 74 75 … … 86 87 87 88 void addElement(OrxonoxOverlay* element); 88 void insertElement(OrxonoxOverlay* element, const std::string & name); 89 bool removeElement(const std::string & name); 89 bool removeElement(OrxonoxOverlay* element); 90 90 OrxonoxOverlay* getElement(unsigned int index); 91 91 92 92 private: 93 std:: map<std::string,OrxonoxOverlay*> hudElements_; //!< Contains all the OrxonoxOverlays of the this group.94 Vector2 scale_; 95 Vector2 scroll_; 96 ControllableEntity* owner_;//!< The owner of this OverlayGroup93 std::set<OrxonoxOverlay*> hudElements_; //!< Contains all the OrxonoxOverlays of the this group. 94 Vector2 scale_; //!< Current scale (independent of the elements). 95 Vector2 scroll_; //!< Current scrolling offset. 96 BaseObject* owner_; //!< The owner of this OverlayGroup 97 97 }; 98 98 }
Note: See TracChangeset
for help on using the changeset viewer.