Changeset 7045 for code/branches/presentation3

Timestamp:

May 31, 2010, 2:10:35 PM (14 years ago)

Author:

scheusso

Message:

RadarViewable need a worldentity* when constructing
i really thought i already did this

Location:

code/branches/presentation3/src

Files:

• modules/objects/triggers/CheckPoint.cc (modified) (1 diff)
• orxonox/interfaces/RadarViewable.cc (modified) (1 diff)
• orxonox/interfaces/RadarViewable.h (modified) (3 diffs)
• orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc

@@ -40 +40 @@
     CheckPoint::CheckPoint(BaseObject* creator) 
         : DistanceTrigger(creator)
-        , RadarViewable(creator)
+        , RadarViewable(creator, static_cast<WorldEntity*>(this))
     {
         RegisterObject(CheckPoint);

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

@@ -41 +41 @@
         @brief Constructor.
     */
-    RadarViewable::RadarViewable(BaseObject* creator)
+    RadarViewable::RadarViewable(BaseObject* creator, const WorldEntity* wePtr)
         : isHumanShip_(false)
         , bVisibility_(true)
         , bInitialized_(false)
         , creator_(creator)
+        , wePtr_(wePtr)
         , radarObjectCamouflage_(0.0f)
         , radarObjectShape_(Dot)

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

@@ -58 +58 @@
 
     public:
-        RadarViewable(BaseObject* creator);
+        RadarViewable(BaseObject* creator, const WorldEntity* wePtr);
         virtual ~RadarViewable();
 
@@ -98 +98 @@
             { return this->bVisibility_; }
 
-        virtual const WorldEntity* getWorldEntity() const = 0;
+        virtual const WorldEntity* getWorldEntity() const{ return this->wePtr_; }
 
         const Vector3& getRVWorldPosition() const;
@@ -133 +133 @@
 
         //Radar
+        const WorldEntity* wePtr_;
         SmartPtr<Radar> radar_;
         float radarObjectCamouflage_;

code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc

@@ -55 +55 @@
     Pawn::Pawn(BaseObject* creator) 
         : ControllableEntity(creator)
-        , RadarViewable(creator)
+        , RadarViewable(creator, static_cast<WorldEntity*>(this))
     {
         RegisterObject(Pawn);