Changeset 1614 for code/branches/hud/src/orxonox/overlays/HUDText.cc

Timestamp:

Jun 21, 2008, 2:35:24 PM (17 years ago)

Author:

rgrieder

Message:

• Dots on the Radar actually disappear now when a Ship gets destroyed…
• svn save to keep History of HUDText when renaming AND moving

File:

• code/branches/hud/src/orxonox/overlays/HUDText.cc (moved) (moved from code/branches/hud/src/orxonox/overlays/hud/HUDText.cc) (5 diffs)

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

@@ -31 +31 @@
 
 #include <OgreOverlayManager.h>
+#include <OgreTextAreaOverlayElement.h>
+#include <OgrePanelOverlayElement.h>
 
 #include "util/Convert.h"
@@ -41 +43 @@
 
   HUDText::HUDText()
-    : background_(0)
-    , text_(0)
+    : text_(0)
   {
     RegisterObject(HUDText);
@@ -53 +54 @@
       if (this->text_)
           OverlayManager::getSingleton().destroyOverlayElement(this->text_);
-      if (this->background_)
-          OverlayManager::getSingleton().destroyOverlayElement(this->background_);
     }
   }
@@ -64 +63 @@
     if (mode == XMLPort::LoadObject)
     {
-      // create background
-      this->background_ = static_cast<PanelOverlayElement*>(
-              OverlayManager::getSingleton().createOverlayElement("Panel", getName() + "_Background"));
-
       this->text_ = static_cast<TextAreaOverlayElement*>(Ogre::OverlayManager::getSingleton().createOverlayElement("TextArea", getName() + "_Text"));
       this->text_->setCharHeight(1.0f);
       this->text_->setFontName("Monofur");
 
-      this->overlay_->add2D(this->background_);
       this->background_->addChild(this->text_);
     }
 
-    XMLPortParam(HUDText, "material", setBackgroundMaterial, getBackgroundMaterial, xmlElement, mode);
     XMLPortParam(HUDText, "font", setFont, getFont, xmlElement, mode);
     XMLPortParam(HUDText, "caption", setCaption, getCaption, xmlElement, mode);
@@ -84 +77 @@
       this->text_->setCaption(this->caption_);
     }
-  }
-
-  void HUDText::setBackgroundMaterial(const std::string& material)
-  {
-    if (this->background_ && material != "")
-      this->background_->setMaterialName(material);
-  }
-
-  std::string HUDText::getBackgroundMaterial() const
-  {
-    if (this->background_)
-      return this->background_->getMaterialName();
-    else
-      return "";
   }