Changeset 8988 for code/branches/presentation2011/src/orxonox/interfaces

Timestamp:

Dec 14, 2011, 4:45:22 PM (13 years ago)

Author:

smerkli

Message:

merged hud branch

Location:

code/branches/presentation2011

Files:

• . (modified) (1 prop)
• src/orxonox/interfaces/RadarViewable.cc (modified) (1 diff)
• src/orxonox/interfaces/RadarViewable.h (modified) (2 diffs)

code/branches/presentation2011/src/orxonox/interfaces/RadarViewable.cc

@@ -51 +51 @@
         , radarObjectDescription_("staticObject")
         , scale_(1.0f)
+                , RVName("")
     {
         RegisterRootObject(RadarViewable);

code/branches/presentation2011/src/orxonox/interfaces/RadarViewable.h

@@ -60 +60 @@
         RadarViewable(BaseObject* creator, const WorldEntity* wePtr);
         virtual ~RadarViewable();
+
+                virtual void setRVName(std::string name)
+                        {
+                                if (this->RVName != name)
+                                {
+                                        this->RVName = name;
+                                        this->settingsChanged();
+                                }
+                        }
+                std::string getRVName() const
+                        { return this->RVName; }
 
         inline void setRadarObjectCamouflage(float camouflage)
@@ -152 +163 @@
         ColourValue radarObjectColour_;
         float scale_;
+                std::string RVName;
     };
 }