- Timestamp:
- May 31, 2010, 2:10:35 PM (14 years ago)
- Location:
- code/branches/presentation3/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc
r6942 r7045 40 40 CheckPoint::CheckPoint(BaseObject* creator) 41 41 : DistanceTrigger(creator) 42 , RadarViewable(creator )42 , RadarViewable(creator, static_cast<WorldEntity*>(this)) 43 43 { 44 44 RegisterObject(CheckPoint); -
code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc
r6961 r7045 41 41 @brief Constructor. 42 42 */ 43 RadarViewable::RadarViewable(BaseObject* creator )43 RadarViewable::RadarViewable(BaseObject* creator, const WorldEntity* wePtr) 44 44 : isHumanShip_(false) 45 45 , bVisibility_(true) 46 46 , bInitialized_(false) 47 47 , creator_(creator) 48 , wePtr_(wePtr) 48 49 , radarObjectCamouflage_(0.0f) 49 50 , radarObjectShape_(Dot) -
code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h
r6942 r7045 58 58 59 59 public: 60 RadarViewable(BaseObject* creator );60 RadarViewable(BaseObject* creator, const WorldEntity* wePtr); 61 61 virtual ~RadarViewable(); 62 62 … … 98 98 { return this->bVisibility_; } 99 99 100 virtual const WorldEntity* getWorldEntity() const = 0;100 virtual const WorldEntity* getWorldEntity() const{ return this->wePtr_; } 101 101 102 102 const Vector3& getRVWorldPosition() const; … … 133 133 134 134 //Radar 135 const WorldEntity* wePtr_; 135 136 SmartPtr<Radar> radar_; 136 137 float radarObjectCamouflage_; -
code/branches/presentation3/src/orxonox/worldentities/pawns/Pawn.cc
r6998 r7045 55 55 Pawn::Pawn(BaseObject* creator) 56 56 : ControllableEntity(creator) 57 , RadarViewable(creator )57 , RadarViewable(creator, static_cast<WorldEntity*>(this)) 58 58 { 59 59 RegisterObject(Pawn);
Note: See TracChangeset
for help on using the changeset viewer.