Changeset 2075 for code/branches

Timestamp:

Oct 31, 2008, 3:52:14 AM (16 years ago)

Author:

landauf

Message:

fixed a small problem in OrxonoxOverlay

Location:

code/branches/objecthierarchy/src/orxonox/overlays

Files:

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

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

@@ -62 +62 @@
         if (overlays_s.find(this->getName()) != overlays_s.end())
         {
-            COUT(1) << "Overlay names should be unique or you cannnot access them via console." << std::endl;
+            COUT(1) << "Overlay names should be unique or you cannnot access them via console. Name: \"" << this->getName() << "\"" << std::endl;
         }
         overlays_s[this->getName()] = this;
@@ -130 +130 @@
         XMLPortParam(OrxonoxOverlay, "correctAspect", setAspectCorrection,   getAspectCorrection,   xmlElement, mode);
         XMLPortParam(OrxonoxOverlay, "background",    setBackgroundMaterial, getBackgroundMaterial, xmlElement, mode);
+    }
+
+    void OrxonoxOverlay::changedName()
+    {
+        OrxonoxOverlay::overlays_s.erase(this->getOldName());
+
+        if (OrxonoxOverlay::overlays_s.find(this->getName()) != OrxonoxOverlay::overlays_s.end())
+            COUT(1) << "Overlay names should be unique or you cannnot access them via console. Name: \"" << this->getName() << "\"" << std::endl;
+
+        OrxonoxOverlay::overlays_s[this->getName()] = this;
     }
 

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

@@ -88 +88 @@
 
         virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
+
+        virtual void changedName();
 
         //! Shows the overlay with an detour to BaseObject::visibility_