Changeset 8738 for code/trunk/src/orxonox

Timestamp:

Jul 9, 2011, 7:45:14 PM (13 years ago)

Author:

landauf

Message:

added "scale" for radar viewables. scale is relative, 1.0 means "normal".
rocket and simple rocket are now visible on the radar as small triangles.
greatly reduced lifetime of simple rocket.
fixed another possible cause for flashing hud radar.

Location:

code/trunk/src/orxonox/interfaces

Files:

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

code/trunk/src/orxonox/interfaces/RadarViewable.cc

@@ -50 +50 @@
         , radarObjectShape_(Dot)
         , radarObjectDescription_("staticObject")
+        , scale_(1.0f)
     {
         RegisterRootObject(RadarViewable);

code/trunk/src/orxonox/interfaces/RadarViewable.h

@@ -113 +113 @@
         inline Shape getRadarObjectShape() const
             { return this->radarObjectShape_; }
+
+        inline void setRadarObjectScale(float scale)
+            {
+                if(this->scale_ != scale)
+                {
+                    this->scale_ = scale;
+                    this->settingsChanged();
+                }
+            }
+        inline float getRadarObjectScale() const
+            { return this->scale_; }
+
         void settingsChanged();
 
@@ -139 +151 @@
         std::string radarObjectDescription_;
         ColourValue radarObjectColour_;
-
+        float scale_;
     };
 }