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

Timestamp:

Jun 14, 2008, 6:37:12 PM (16 years ago)

Author:

rgrieder

Message:

• new folder structure for overlays:

orxonox/

…
overlays/

console/
hud/

• Navigation —> HUDNavigation
• HUD —> OverlayGroup (not yet begun with that except renaming and getHUD() instead of getSingleton())
• moved HUD.oxo (file ending should stand for orxonox overlay) to media repository in overlay folder
• fixed a bug with console noiseSize_ config value (was inverted..)

File:

• code/branches/hud/src/orxonox/overlays/OrxonoxOverlay.cc (moved) (moved from code/branches/hud/src/orxonox/overlays/HUDOverlay.cc) (11 diffs)

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

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
-#include "HUDOverlay.h"
+#include "OrxonoxOverlay.h"
 
 #include <OgreOverlayManager.h>
@@ -37 +37 @@
 namespace orxonox
 {
-  unsigned int HUDOverlay::hudOverlayCounter_s = 0;
+  unsigned int OrxonoxOverlay::hudOverlayCounter_s = 0;
 
-  HUDOverlay::HUDOverlay()
+  OrxonoxOverlay::OrxonoxOverlay()
     : overlay_(0)
     , windowAspectRatio_(1.0f)
@@ -47 +47 @@
     , angle_(0.0f)
     , position_(0.0f, 0.0f)
-    , origin_(0.5f, 0.5f)
+    , origin_(0.0f, 0.0f)
   {
-    RegisterObject(HUDOverlay);
+    RegisterObject(OrxonoxOverlay);
   }
 
-  void HUDOverlay::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+  void OrxonoxOverlay::XMLPort(Element& xmlElement, XMLPort::Mode mode)
   {
     BaseObject::XMLPort(xmlElement, mode);
@@ -58 +58 @@
     if (mode == XMLPort::LoadObject)
     {
-      overlay_ = Ogre::OverlayManager::getSingleton().create("HUDOverlay"
+      overlay_ = Ogre::OverlayManager::getSingleton().create("OrxonoxOverlay"
             + convertToString(hudOverlayCounter_s++) + "_" + this->getName());
 
@@ -65 +65 @@
     }
 
-    XMLPortParam(HUDOverlay, "correctAspect", setAspectCorrection, getAspectCorrection, xmlElement, mode);
-    XMLPortParam(HUDOverlay, "size", setSize, getSize, xmlElement, mode);
-    XMLPortParam(HUDOverlay, "rotation", setRotation, getRotation, xmlElement, mode);
-    XMLPortParam(HUDOverlay, "origin", setOrigin, getOrigin, xmlElement, mode);
-    XMLPortParam(HUDOverlay, "position", setPosition, getPosition, xmlElement, mode);
+    XMLPortParam(OrxonoxOverlay, "correctAspect", setAspectCorrection, getAspectCorrection, xmlElement, mode);
+    XMLPortParam(OrxonoxOverlay, "size", setSize, getSize, xmlElement, mode);
+    XMLPortParam(OrxonoxOverlay, "rotation", setRotation, getRotation, xmlElement, mode);
+    XMLPortParam(OrxonoxOverlay, "origin", setOrigin, getOrigin, xmlElement, mode);
+    XMLPortParam(OrxonoxOverlay, "position", setPosition, getPosition, xmlElement, mode);
 
     if (mode == XMLPort::LoadObject)
@@ -81 +81 @@
   }
 
-  HUDOverlay::~HUDOverlay()
+  OrxonoxOverlay::~OrxonoxOverlay()
   {
   }
 
-  void HUDOverlay::changedVisibility()
+  void OrxonoxOverlay::changedVisibility()
   {
     if (this->overlay_)
@@ -96 +96 @@
   }
 
-  void HUDOverlay::windowResized(int newWidth, int newHeight)
+  void OrxonoxOverlay::windowResized(int newWidth, int newHeight)
   {
     this->windowAspectRatio_ = newWidth/(float)newHeight;
@@ -103 +103 @@
   }
 
-  void HUDOverlay::setAspectCorrection(bool val)
+  void OrxonoxOverlay::setAspectCorrection(bool val)
   {
     if (val)
@@ -126 +126 @@
       This function can be overriden by any derivative.
   */
-  void HUDOverlay::sizeChanged()
+  void OrxonoxOverlay::sizeChanged()
   {
     this->overlay_->setScale(size_.x * sizeCorrection_.x, size_.y * sizeCorrection_.y);
@@ -135 +135 @@
       This function can be overriden by any derivative.
   */
-  void HUDOverlay::angleChanged()
+  void OrxonoxOverlay::angleChanged()
   {
     this->overlay_->setRotate(this->angle_);
@@ -144 +144 @@
       This function can be overriden by any derivative.
   */
-  void HUDOverlay::positionChanged()
+  void OrxonoxOverlay::positionChanged()
   {
     Vector2 scroll = (position_ - 0.5 - size_ * (origin_ - 0.5)) * 2.0;