Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 27, 2011, 10:54:34 PM (13 years ago)
Author:
dafrick
Message:

Some changes in prsentation level. Making PortalEndPoints radar viewable.

Location:
code/branches/presentation/src/modules/portals
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation/src/modules/portals/PortalEndPoint.cc

    r8605 r8628  
    4242    std::map<unsigned int, PortalEndPoint *> PortalEndPoint::idMap_s;
    4343
    44     PortalEndPoint::PortalEndPoint(BaseObject* creator) : StaticEntity(creator), id_(0), trigger_(NULL), reenterDelay_(0)
     44    PortalEndPoint::PortalEndPoint(BaseObject* creator) : StaticEntity(creator), RadarViewable(creator, static_cast<WorldEntity*>(this)), id_(0), trigger_(NULL), reenterDelay_(0)
    4545    {
    4646        RegisterObject(PortalEndPoint);
     
    4949        this->trigger_->setName("portal");
    5050        this->attach(trigger_);
     51
     52        this->setRadarObjectColour(ColourValue::White);
     53        this->setRadarObjectShape(RadarViewable::Dot);
     54        this->setRadarVisibility(true);
    5155    }
    5256   
     
    117121    }
    118122
     123    void PortalEndPoint::changedActivity(void)
     124    {
     125        SUPER(PortalEndPoint, changedActivity);
     126       
     127        this->setRadarVisibility(this->isActive());
     128    }
     129
    119130    bool PortalEndPoint::letsEnter(MobileEntity* entity)
    120131    {
  • code/branches/presentation/src/modules/portals/PortalEndPoint.h

    r8605 r8628  
    4343
    4444#include "worldentities/StaticEntity.h"
     45#include "interfaces/RadarViewable.h"
    4546#include "graphics/Billboard.h"
    4647#include "objects/triggers/DistanceMultiTrigger.h"
     
    5758     */
    5859   
    59     class _PortalsExport PortalEndPoint : public StaticEntity
     60    class _PortalsExport PortalEndPoint : public StaticEntity, public RadarViewable
    6061    {
    6162        public:
    6263            PortalEndPoint(BaseObject* creator);
    6364            virtual ~PortalEndPoint();
     65           
    6466            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     67            virtual void changedActivity(void);
     68           
    6569            inline void setTarget(const std::string & target)                 //!< add types which are allowed to activate the PortalEndPoint
    66             {
    67                 this->trigger_->addTarget(target);
    68             }
     70                { this->trigger_->addTarget(target); }
    6971           
    7072            void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
    7173            static std::map<unsigned int, PortalEndPoint *> idMap_s; //!< Maps the id of each PortalEndPoint to a pointer to that PortalEndPoint
    7274            inline void setReenterDelay(unsigned int seconds)
    73             {
    74                 this->reenterDelay_ = seconds;
    75             }
     75                { this->reenterDelay_ = seconds; }
    7676            inline unsigned int getReenterDelay()
    77             {
    78                 return this->reenterDelay_;
    79             }
     77                { return this->reenterDelay_; }
    8078            inline void setID(unsigned int id)
    81             {
    82                 this->id_ = id;
    83             }
     79                { this->id_ = id; }
    8480           
    8581            inline unsigned int getID() const
    86             {
    87                 return this->id_;
    88             }
     82                { return this->id_; }
    8983           
    9084            /// \brief Set templateName_ (the name of the design Template) and add that Template to this Object
    9185            inline void setTemplate(const std::string & name)
    92             {
    93                 this->templateName_ = name;
    94                 this->addTemplate(name);
    95             }
     86                { this->templateName_ = name; this->addTemplate(name); }
    9687
    9788            /// \brief Get the name of the attached design template
    9889            inline const std::string & getTemplate()
    99             {
    100                 return this->templateName_;
    101             }
     90                { return this->templateName_; }
    10291
    10392            /*! \brief This function is called each time the DistanceMultiTrigger of this PortalEndPoint changed
Note: See TracChangeset for help on using the changeset viewer.