Changeset 1604 for code/branches/hud/src/orxonox/overlays/OrxonoxOverlay.cc

Timestamp:

Jun 15, 2008, 1:09:07 AM (16 years ago)

Author:

rgrieder

Message:

• adjusted Radar to fit in XML loading scheme
• OverlayGroup should be more or less what I imagine for now (only supports scale method to scale the entire HUD)
• singletonized HUDNavigation (and HUDRadar of course): These are temporary hacks!

File:

• code/branches/hud/src/orxonox/overlays/OrxonoxOverlay.cc (modified) (4 diffs)

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

@@ -66 +66 @@
 
     XMLPortParam(OrxonoxOverlay, "correctAspect", setAspectCorrection, getAspectCorrection, xmlElement, mode);
-    XMLPortParam(OrxonoxOverlay, "size", setSize, getSize, xmlElement, mode);
+    XMLPortParam(OrxonoxOverlay, "size", setSize, getUncorrectedSize, xmlElement, mode);
     XMLPortParam(OrxonoxOverlay, "rotation", setRotation, getRotation, xmlElement, mode);
     XMLPortParam(OrxonoxOverlay, "origin", setOrigin, getOrigin, xmlElement, mode);
@@ -78 +78 @@
 
       this->sizeChanged();
+      this->positionChanged();
+      this->angleChanged();
     }
   }
@@ -129 +131 @@
   {
     this->overlay_->setScale(size_.x * sizeCorrection_.x, size_.y * sizeCorrection_.y);
+    positionChanged();
   }
 
@@ -146 +149 @@
   void OrxonoxOverlay::positionChanged()
   {
-    Vector2 scroll = (position_ - 0.5 - size_ * (origin_ - 0.5)) * 2.0;
+    Vector2 scroll = (position_ - 0.5 - size_ * sizeCorrection_ * (origin_ - 0.5)) * 2.0;
     this->overlay_->setScroll(scroll.x, -scroll.y);
   }