Changeset 1615 for code/branches/hud/src/orxonox/overlays/OrxonoxOverlay.h

Timestamp:

Jun 22, 2008, 12:06:55 AM (16 years ago)

Author:

rgrieder

Message:

• added blankString to String so you can return ""; even if it's a const std::string&
• fixed several bugs with aspect correct and margin alignment
• added console commands for OrxonoxOverlays and OverlayGroups for rotate, scale and scroll (you can access the by name (from name=.. in xml file), e.g. "OrxonoxOverlay rotateOverlay SpeedBar 90)
• converted everything in overlays/ to 4 spaces/tab
• removed all using namespace Ogre;
• added background_ Panel to OrxonoxOverlay, since most of the derived classes can use that
• should work now, but I'll have to test on a tardis box first

File:

• code/branches/hud/src/orxonox/overlays/OrxonoxOverlay.h (modified) (6 diffs)

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

@@ -42 +42 @@
     {
     public:
-        Ogre::Overlay* getOverlay() { return this->overlay_; }
         OrxonoxOverlay();
         virtual ~OrxonoxOverlay();
@@ -70 +69 @@
 
         /** Sets the rotation applied to this overlay.*/
-        void setRotation(const Ogre::Radian& angle) { this->angle_ = angle; this->angleChanged(); }
+        void setRotation(const Degree& angle) { this->angle_ = angle; this->angleChanged(); }
 
         /** Gets the rotation applied to this overlay, in degrees.*/
@@ -76 +75 @@
 
         /** Adds the passed in angle to the rotation applied to this overlay. */
-        void rotate(const Radian& angle) { this->angle_ += angle; this->angleChanged(); }
+        void rotate(const Degree& angle) { this->angle_ += angle; this->angleChanged(); }
 
         /** Sets the size of this overlay. */
@@ -93 +92 @@
         void scale(Vector2 scale) { this->size_ *= scale; this->sizeChanged(); }
 
+        static void scaleOverlay(const std::string& name, float scale);
+        static void scrollOverlay(const std::string& name, const Vector2& scroll);
+        static void rotateOverlay(const std::string& name, const Degree& angle);
+
     protected:
         virtual void changedVisibility();
@@ -98 +101 @@
         virtual void angleChanged();
         virtual void positionChanged();
-        float getWindowAspectRatio() { return windowAspectRatio_; }
+        virtual void sizeCorrectionChanged();
 
         void setBackgroundMaterial(const std::string& material);
-        std::string getBackgroundMaterial() const;
+        const std::string& getBackgroundMaterial() const;
 
         Ogre::Overlay* overlay_;
         Ogre::PanelOverlayElement* background_;
-
-    private:
-        void windowResized(int newWidth, int newHeight);
-
         float windowAspectRatio_;
         bool bCorrectAspect_;
@@ -117 +116 @@
         Vector2 origin_;
 
+    private:
+        void windowResized(int newWidth, int newHeight);
+
         static unsigned int hudOverlayCounter_s;
+        static std::map<std::string, OrxonoxOverlay*> overlays_s;
   };
 }