Changeset 6067 for code/branches/particles2/src/orxonox/overlays/OverlayGroup.h

Timestamp:

Nov 15, 2009, 1:44:25 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 6054, 6056 and 6057 to particles2 branch.

Location:

code/branches/particles2

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/OverlayGroup.h (modified) (2 diffs)

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

@@ -64 +64 @@
         static void scrollGroup(const std::string& name, const Vector2& scroll);
 
-        inline const std::set<OrxonoxOverlay*>& getOverlays() const
+        inline const std::set< SmartPtr<OrxonoxOverlay> >& getOverlays() const
             { return this->hudElements_; }
 
@@ -90 +90 @@
 
     private:
-        std::set<OrxonoxOverlay*> hudElements_;    //!< Contains all the OrxonoxOverlays of the this group.
+        std::set< SmartPtr<OrxonoxOverlay> > hudElements_;    //!< Contains all the OrxonoxOverlays of the this group.
         Vector2 scale_;                            //!< Current scale (independent of the elements).
         Vector2 scroll_;                           //!< Current scrolling offset.