Changeset 8738 for code/trunk

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

Files:

• modules/overlays/hud/HUDRadar.cc (modified) (2 diffs)
• modules/weapons/projectiles/Rocket.cc (modified) (2 diffs)
• modules/weapons/projectiles/Rocket.h (modified) (2 diffs)
• modules/weapons/projectiles/SimpleRocket.cc (modified) (2 diffs)
• modules/weapons/projectiles/SimpleRocket.h (modified) (2 diffs)
• orxonox/interfaces/RadarViewable.cc (modified) (1 diff)
• orxonox/interfaces/RadarViewable.h (modified) (2 diffs)

code/trunk/src/modules/overlays/hud/HUDRadar.cc

@@ -106 +106 @@
         panel->setMaterialName(TextureGenerator::getMaterialName(
             shapeMaterials_[object->getRadarObjectShape()], object->getRadarObjectColour()));
+        panel->hide();
         this->radarObjects_[object] = panel;
     }
@@ -166 +167 @@
             float distance = (wePointer->getWorldPosition() - this->owner_->getPosition()).length();
             // calculate the size with 1/distance dependency for simplicity (instead of exp(-distance * lambda)
-            float size = maximumDotSize_ * halfDotSizeDistance_ / (halfDotSizeDistance_ + distance);
+            float size = maximumDotSize_ * halfDotSizeDistance_ / (halfDotSizeDistance_ + distance) * it->first->getRadarObjectScale();
             it->second->setDimensions(size, size);
 

code/trunk/src/modules/weapons/projectiles/Rocket.cc

@@ -52 +52 @@
         Constructor. Registers the object and initializes some default values.
     */
-    Rocket::Rocket(BaseObject* creator) : ControllableEntity(creator), BasicProjectile()
+    Rocket::Rocket(BaseObject* creator)
+        : ControllableEntity(creator)
+        , BasicProjectile()
+        , RadarViewable(creator, static_cast<WorldEntity*>(this))
     {
         RegisterObject(Rocket);// - register the Rocket class to the core
@@ -106 +109 @@
         camPosition->setAllowMouseLook(true);
         this->addCameraPosition(camPosition);
+
+        this->setRadarObjectColour(ColourValue(1.0, 0.5, 0.0)); // orange
+        this->setRadarObjectShape(RadarViewable::Triangle);
+        this->setRadarObjectScale(0.5f);
     }
 

code/trunk/src/modules/weapons/projectiles/Rocket.h

@@ -34 +34 @@
 #include "tools/Timer.h"
 #include "worldentities/ControllableEntity.h"
+#include "interfaces/RadarViewable.h"
 
 #include "BasicProjectile.h"
@@ -48 +49 @@
         Oli Scheuss
     */
-    class _WeaponsExport Rocket : public ControllableEntity, public BasicProjectile
+    class _WeaponsExport Rocket : public ControllableEntity, public BasicProjectile, public RadarViewable
     {
         public:

code/trunk/src/modules/weapons/projectiles/SimpleRocket.cc

@@ -48 +48 @@
     CreateFactory(SimpleRocket);
 
-    SimpleRocket::SimpleRocket(BaseObject* creator) : ControllableEntity(creator), BasicProjectile()
+    SimpleRocket::SimpleRocket(BaseObject* creator)
+        : ControllableEntity(creator)
+        , BasicProjectile()
+        , RadarViewable(creator, static_cast<WorldEntity*>(this))
     {
         RegisterObject(SimpleRocket);// - register the SimpleRocket class to the core
 
         this->localAngularVelocity_ = 0;
-        this->lifetime_ = 120;
+        this->lifetime_ = 10;
 
         this->setMass(15);
@@ -86 +89 @@
         }
 
+        this->setRadarObjectColour(ColourValue(1.0, 1.0, 0.0)); // yellow
+        this->setRadarObjectShape(RadarViewable::Triangle);
+        this->setRadarObjectScale(0.5f);
     }
 

code/trunk/src/modules/weapons/projectiles/SimpleRocket.h

@@ -35 +35 @@
 #include "worldentities/ControllableEntity.h"
 #include "graphics/ParticleSpawner.h"
+#include "interfaces/RadarViewable.h"
 
 #include "BasicProjectile.h"
@@ -48 +49 @@
        Gabriel Nadler (Original file: Oli Scheuss)
     */
-    class _WeaponsExport SimpleRocket : public ControllableEntity, public BasicProjectile
+    class _WeaponsExport SimpleRocket : public ControllableEntity, public BasicProjectile, public RadarViewable
     {
         public:

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_;
     };
 }