Changeset 1632 for code/trunk

Timestamp:

Jun 29, 2008, 5:37:26 PM (16 years ago)

Author:

rgrieder

Message:

fixed a bug in OverlayText (no text was seen)
adjusted OverlayText in conjunction with aspect ratio

Location:

code/trunk/src/orxonox/overlays

Files:

• OrxonoxOverlay.cc (modified) (1 diff)
• OrxonoxOverlay.h (modified) (2 diffs)
• OverlayText.cc (modified) (2 diffs)

code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

@@ -207 +207 @@
             float tempAspect;
             if (angle > 89.0 && angle < 91.0)
+            {
                 tempAspect = 1.0 / this->windowAspectRatio_;
+                rotState_ = Vertical;
+            }
             else if (angle > 179 || angle < 1)
+            {
                 tempAspect = this->windowAspectRatio_;
+                rotState_ = Horizontal;
+            }
             else
+            {
                 tempAspect = 1.0;
+                rotState_ = Inbetween;
+            }
 
             // note: this is only an approximation that is mostly valid when the

code/trunk/src/orxonox/overlays/OrxonoxOverlay.h

@@ -69 +69 @@
     class _OrxonoxExport OrxonoxOverlay : public BaseObject, public WindowEventListener
     {
+    public:
+        /**
+        @brief
+            Describes the rotational state of a an overlay.
+            Horizontal means 0/180 degrees, Vertical is 90/270 degrees
+            and Inbetween is everything else.
+        */
+        enum RotationState
+        {
+            Horizontal,
+            Vertical,
+            Inbetween
+        };
+
     public:
         OrxonoxOverlay();
@@ -156 +170 @@
         Vector2 pickPoint_;                        //!< Point on the overlay to pick when translating
         Radian angle_;                             //!< Rotation angle of the overlay
+        RotationState rotState_;             //!< horizontal, vertical or inbetween
 
     private:

code/trunk/src/orxonox/overlays/OverlayText.cc

@@ -63 +63 @@
             this->text_ = static_cast<Ogre::TextAreaOverlayElement*>(Ogre::OverlayManager::getSingleton()
                 .createOverlayElement("TextArea", "OverlayText_text_" + getUniqueNumberStr()));
+            this->text_->setCharHeight(1.0);
 
             this->background_->addChild(this->text_);
@@ -91 +92 @@
             return;
 
-        this->overlay_->setScale(size_.y * sizeCorrection_.y, size_.y * sizeCorrection_.y);
+        if (this->rotState_ == Horizontal)
+            this->overlay_->setScale(size_.y * sizeCorrection_.y, size_.y * sizeCorrection_.y);
+        else if (this->rotState_ == Vertical)
+            this->overlay_->setScale(size_.y / (sizeCorrection_.y * sizeCorrection_.y), size_.y * sizeCorrection_.y);
+        else
+            this->overlay_->setScale(size_.y, size_.y);
+
         positionChanged();
     }