Changeset 6108 for code/branches/presentation2/src/orxonox/overlays

Timestamp:

Nov 20, 2009, 8:15:25 PM (15 years ago)

Author:

scheusso

Message:

merged steering branch to presentation2 branch

Location:

code/branches/presentation2

Files:

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

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

@@ -155 +155 @@
         static void rotateOverlay(const std::string& name, const Degree& angle);
 
+        void setBackgroundMaterial(const std::string& material);
+        const std::string& getBackgroundMaterial() const;
+
         virtual void changedVisibility();
 
@@ -181 +184 @@
         virtual void positionChanged();
 
-        void setBackgroundMaterial(const std::string& material);
-        const std::string& getBackgroundMaterial() const;
-
         Ogre::Overlay* overlay_;                   //!< The overlay the entire class is about.
         Ogre::PanelOverlayElement* background_;    //!< Background image (blank per default).