Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 14, 2008, 1:42:17 AM (16 years ago)
Author:
rgrieder
Message:
  • updated msvc files
  • Fixed build by including util/Integer.h in NetworkPrereqs.h instead of util/Math.h
  • Fixed issue with a this pointer used in the base class c'tor initialisation
  • Fixed build under windows: INFINITE seems to be a macro, defined in winbase.h. Constant was somewhere in the quest files.
  • Fixed build: Only integral types can have header-file value when declared as static const. Float is not supported by the standard.
  • Fixed a potential bug in Planet.cc: "if (cond) doOne; doTwo" —> missing brances (indentation was correct, so I assume there have to be brances)
  • Corrected lots of indentation problems with tabs/spaces mix.
  • Changed all "@file Blubb.h" to "@file": Doxygen then assumes the actual filename. This gives more flexibility.
Location:
code/branches/presentation/src/orxonox/objects
Files:
38 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation/src/orxonox/objects/quest/AddQuest.cc

    r2420 r2435  
    2828
    2929/**
    30     @file AddQuest.cc
     30    @file
    3131    @brief Implementation of the AddQuest class.
    3232*/
    … …  
    4444#include "Quest.h"
    4545
    46 namespace orxonox {
    47 
     46namespace orxonox
     47{
    4848    CreateFactory(AddQuest);
    4949

  • code/branches/presentation/src/orxonox/objects/quest/AddQuest.h

    r2420 r2435  
    2828
    2929/**
    30     @file AddQuest.h
     30    @file
    3131    @brief Definition of the AddQuest class.
    3232*/
    … …  
    4242#include "ChangeQuestStatus.h"
    4343
    44 namespace orxonox {
    45 
     44namespace orxonox
     45{
    4646    /**
    4747    @brief

  • code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.cc

    r2420 r2435  
    2828
    2929/**
    30     @file AddQuestHint.cc
     30    @file
    3131    @brief Implementation of the AddQuestHint class.
    3232*/
    … …  
    4343#include "QuestHint.h"
    4444
    45 namespace orxonox {
    46 
     45namespace orxonox
     46{
    4747    CreateFactory(AddQuestHint);
    4848

  • code/branches/presentation/src/orxonox/objects/quest/AddQuestHint.h

    r2420 r2435  
    2828
    2929/**
    30     @file AddQuestHint.h
     30    @file
    3131    @brief Definition of the AddQuestHint class.
    3232*/
    … …  
    4141#include "QuestEffect.h"
    4242
    43 namespace orxonox {
    44 
     43namespace orxonox
     44{
    4545    /**
    4646    @brief

  • code/branches/presentation/src/orxonox/objects/quest/AddReward.cc

    r2420 r2435  
    2828
    2929/**
    30     @file AddReward.cc
     30    @file
    3131    @brief Implementation of the AddReward class.
    3232*/
    … …  
    4040#include "Rewardable.h"
    4141
    42 namespace orxonox {
    43 
     42namespace orxonox
     43{
    4444    CreateFactory(AddReward);
    4545

  • code/branches/presentation/src/orxonox/objects/quest/AddReward.h

    r2420 r2435  
    2828
    2929/**
    30     @file AddReward.h
     30    @file
    3131    @brief Definition of the AddReward class.
    3232*/
    … …  
    4242#include "QuestEffect.h"
    4343
    44 namespace orxonox {
    45 
     44namespace orxonox
     45{
    4646    /**
    4747    @brief

  • code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.cc

    r2420 r2435  
    2828
    2929/**
    30     @file ChangeQuestStatus.cc
     30    @file
    3131    @brief Implementation of the ChangeQuestStatus class.
    3232*/
    … …  
    3939#include "QuestItem.h"
    4040
    41 namespace orxonox {
    42 
     41namespace orxonox
     42{
    4343    /**
    4444    @brief

  • code/branches/presentation/src/orxonox/objects/quest/ChangeQuestStatus.h

    r2420 r2435  
    2828
    2929/**
    30     @file ChangeQuestStatus.h
     30    @file
    3131    @brief Definition of the ChangeQuestStatus class.
    3232*/
    … …  
    4242#include "QuestEffect.h"
    4343
    44 namespace orxonox {
    45 
     44namespace orxonox
     45{
    4646    /**
    4747    @brief

  • code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.cc

    r2420 r2435  
    2828 
    2929/**
    30     @file CompleteQuest.cc
     30    @file
    3131    @brief Implementation of the CompleteQuest class.
    3232*/
    … …  
    4242#include "Quest.h"
    4343
    44 namespace orxonox {
    45 
     44namespace orxonox
     45{
    4646    CreateFactory(CompleteQuest);
    4747

  • code/branches/presentation/src/orxonox/objects/quest/CompleteQuest.h

    r2420 r2435  
    2828
    2929/**
    30     @file CompleteQuest.h
     30    @file
    3131    @brief Definition of the CompleteQuest class.
    3232*/
    … …  
    4242#include "ChangeQuestStatus.h"
    4343
    44 namespace orxonox {
    45 
     44namespace orxonox
     45{
    4646    /**
    4747    @brief

  • code/branches/presentation/src/orxonox/objects/quest/FailQuest.cc

    r2420 r2435  
    2828 
    2929/**
    30     @file FailQuest.cc
     30    @file
    3131    @brief Implementation of the FailQuest class.
    3232*/
    … …  
    4242#include "Quest.h"
    4343
    44 namespace orxonox {
    45 
     44namespace orxonox
     45{
    4646    CreateFactory(FailQuest);
    4747

  • code/branches/presentation/src/orxonox/objects/quest/FailQuest.h

    r2420 r2435  
    2828
    2929/**
    30     @file FailQuest.h
     30    @file
    3131    @brief Definition of the FailQuest class.
    3232*/
    … …  
    4242#include "ChangeQuestStatus.h"
    4343
    44 namespace orxonox {
    45 
     44namespace orxonox
     45{
    4646    /**
    4747    @brief

  • code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.cc

    r2420 r2435  
    2828 
    2929/**
    30     @file GlobalQuest.cc
     30    @file
    3131    @brief Implementation of the GlobalQuest class.
    3232*/
    … …  
    4242#include "QuestEffect.h"
    4343
    44 namespace orxonox {
    45 
     44namespace orxonox
     45{
    4646    CreateFactory(GlobalQuest);
    4747

  • code/branches/presentation/src/orxonox/objects/quest/GlobalQuest.h

    r2420 r2435  
    2828 
    2929/**
    30     @file GlobalQuest.h
     30    @file
    3131    @brief Definition of the GlobalQuest class.
    3232*/
    … …  
    4343#include "Quest.h"
    4444
    45 namespace orxonox {
    46 
     45namespace orxonox
     46{
    4747    /**
    4848    @brief

  • code/branches/presentation/src/orxonox/objects/quest/LocalQuest.cc

    r2420 r2435  
    2828
    2929/**
    30     @file LocalQuest.cc
     30    @file
    3131    @brief Implementation of the LocalQuest class.
    3232*/
    … …  
    4242#include "QuestEffect.h"
    4343
    44 namespace orxonox {
    45 
     44namespace orxonox
     45{
    4646    CreateFactory(LocalQuest);
    4747

  • code/branches/presentation/src/orxonox/objects/quest/LocalQuest.h

    r2420 r2435  
    2828 
    2929/**
    30     @file LocalQuest.h
     30    @file
    3131    @brief Definition of the LocalQuest class.
    3232*/
    … …  
    4343#include "Quest.h"
    4444
    45 namespace orxonox {
    46 
     45namespace orxonox
     46{
    4747    /**
    4848    @brief

  • code/branches/presentation/src/orxonox/objects/quest/Quest.cc

    r2420 r2435  
    2828 
    2929/**
    30     @file Quest.cc
     30    @file
    3131    @brief Implementation of the Quest class.
    3232*/
    … …  
    4444#include "QuestListener.h"
    4545
    46 namespace orxonox {
    47 
     46namespace orxonox
     47{
    4848    /**
    4949    @brief

  • code/branches/presentation/src/orxonox/objects/quest/Quest.h

    r2420 r2435  
    2828 
    2929/**
    30     @file Quest.h
     30    @file
    3131    @brief Definition of the Quest class.
    3232        The Quest is the parent class of LocalQuest and GlobalQuest.
    … …  
    4545#include "QuestItem.h"
    4646
    47 namespace questStatus
     47namespace orxonox
    4848{
     49    namespace questStatus
     50    {
    4951
    50     //!Different states of a Quest.
    51     enum Enum
    52     {
    53         inactive,
    54         active,
    55         failed,
    56         completed
    57     };
     52        //!Different states of a Quest.
     53        enum Enum
     54        {
     55            inactive,
     56            active,
     57            failed,
     58            completed
     59        };
    5860
    59 }
    60 
    61 namespace orxonox {
     61    }
    6262
    6363    /**

  • code/branches/presentation/src/orxonox/objects/quest/QuestDescription.cc

    r2420 r2435  
    2828
    2929/**
    30     @file QuestDescription.cc
     30    @file
    3131    @brief Implementation of the QuestDescription class.
    3232*/
    … …  
    3939#include "orxonox/overlays/notifications/Notification.h"
    4040
    41 namespace orxonox {
    42 
     41namespace orxonox
     42{
    4343    CreateFactory(QuestDescription);
    4444
    … …  
    128128        }
    129129       
    130         Notification* notification = new Notification(message, title, 30);
     130        Notification* notification = new Notification(0, message, title, 30);
    131131        notification->send();
    132132        return true;

  • code/branches/presentation/src/orxonox/objects/quest/QuestDescription.h

    r2420 r2435  
    2828
    2929/**
    30     @file QuestDescription.h
     30    @file
    3131    @brief Definition of the QuestDescription class.
    3232*/
    … …  
    4242#include "core/XMLPort.h"
    4343
    44 namespace orxonox {
    45 
     44namespace orxonox
     45{
    4646    /**
    4747    @brief
    … …  
    5555        Damian 'Mozork' Frick
    5656    */
    57     class _OrxonoxExport QuestDescription : public BaseObject {
    58 
     57    class _OrxonoxExport QuestDescription : public BaseObject
     58    {
    5959        public:
    6060            QuestDescription(BaseObject* creator);

  • code/branches/presentation/src/orxonox/objects/quest/QuestEffect.cc

    r2420 r2435  
    2828
    2929/**
    30     @file QuestEffect.cc
     30    @file
    3131    @brief Implementation of the QuestEffect class.
    3232*/
    … …  
    3939#include "orxonox/objects/infos/PlayerInfo.h"
    4040
    41 namespace orxonox {
    42 
     41namespace orxonox
     42{
    4343    /**
    4444    @brief

  • code/branches/presentation/src/orxonox/objects/quest/QuestEffect.h

    r2420 r2435  
    2828 
    2929/**
    30     @file QuestEffect.h
     30    @file
    3131    @brief Definition of the QuestEffect class.
    3232*/
    … …  
    4141#include "core/BaseObject.h"
    4242
    43 namespace orxonox {
    44 
     43namespace orxonox
     44{
    4545    /**
    4646    @brief

  • code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.cc

    r2385 r2435  
    2828
    2929/**
    30     @file QuestEffectBeacon.cc
     30    @file
    3131    @brief Implementation of the QuestEffectBeacon class.
    3232*/
    … …  
    4545#include "QuestEffect.h"
    4646
    47 namespace orxonox {
    48 
     47namespace orxonox
     48{
    4949    CreateFactory(QuestEffectBeacon);
    5050
    … …  
    5858       
    5959        this->status_ = QuestEffectBeaconStatus::active;
    60         this->times_ = INFINITE;
     60        this->times_ = INFINITE_TIME;
    6161    }
    6262
    … …  
    186186            return false;
    187187        }
    188         if(this->getTimes() == INFINITE) //!< If times is infinity the QuestEffectBeacon can be executed an infinite number fo times.
     188        if(this->getTimes() == INFINITE_TIME) //!< If times is infinity the QuestEffectBeacon can be executed an infinite number fo times.
    189189        {
    190190            return true;
    … …  
    212212    bool QuestEffectBeacon::setTimes(const int & n)
    213213    {
    214         if(n < 0 && n != INFINITE)
     214        if(n < 0 && n != INFINITE_TIME)
    215215        {
    216216            return false;

  • code/branches/presentation/src/orxonox/objects/quest/QuestEffectBeacon.h

    r2385 r2435  
    2828
    2929/**
    30     @file QuestEffectBeacon.h
     30    @file
    3131    @brief Definition of the QuestEffectBeacon class.
    3232*/
    … …  
    3939#include "orxonox/objects/worldentities/PositionableEntity.h"
    4040
    41 namespace QuestEffectBeaconStatus
     41namespace orxonox
    4242{
     43    namespace QuestEffectBeaconStatus
     44    {
    4345
    44     //! The status of the beacon, can be either active or inactive.
    45     enum Enum
    46     {
    47         inactive,
    48         active
    49     };
     46        //! The status of the beacon, can be either active or inactive.
     47        enum Enum
     48        {
     49            inactive,
     50            active
     51        };
    5052
    51 }
    52 
    53 namespace orxonox {
     53    }
    5454
    5555    /**
    … …  
    112112   
    113113        private:
    114             static const int INFINITE = -1; //!< Constant to avoid using magic numbers.
     114            static const int INFINITE_TIME = -1; //!< Constant to avoid using magic numbers.
    115115           
    116116            std::list<QuestEffect*> effects_; //!< The list of QuestEffects to be invoked on the executing player.

  • code/branches/presentation/src/orxonox/objects/quest/QuestHint.cc

    r2420 r2435  
    2828 
    2929/**
    30     @file QuestHint.cc
     30    @file
    3131    @brief Implementation of the QuestHint class.
    3232*/
    … …  
    4343#include "Quest.h"
    4444
    45 namespace orxonox {
    46 
     45namespace orxonox
     46{
    4747    CreateFactory(QuestHint);
    4848

  • code/branches/presentation/src/orxonox/objects/quest/QuestHint.h

    r2420 r2435  
    2828 
    2929/**
    30     @file QuestHint.h
     30    @file
    3131    @brief Definition of the QuestHint class.
    3232*/
    … …  
    4343#include "QuestItem.h"
    4444
    45 namespace questHintStatus
    46 {
    47 
    48     //! The state of the hint.
    49     enum Enum
    50     {
    51         inactive,
    52         active
    53     };
    54 
    55 }
    56 
    5745namespace orxonox
    5846{
     47    namespace questHintStatus
     48    {
     49
     50        //! The state of the hint.
     51        enum Enum
     52        {
     53            inactive,
     54            active
     55        };
     56
     57    }
    5958
    6059    /**

  • code/branches/presentation/src/orxonox/objects/quest/QuestItem.cc

    r2420 r2435  
    2828 
    2929/**
    30     @file QuestItem.cc
     30    @file
    3131    @brief Implementation of the QuestItem class.
    3232*/
    … …  
    3939#include "QuestDescription.h"
    4040
    41 namespace orxonox {
    42 
     41namespace orxonox
     42{
    4343    /**
    4444    @brief

  • code/branches/presentation/src/orxonox/objects/quest/QuestItem.h

    r2420 r2435  
    2828 
    2929/**
    30     @file QuestItem.h
     30    @file
    3131    @brief Definition of the QuestItem class.
    3232        The QuestItem is the parent class of Quest and QuestHint.
    … …  
    4444#include "core/XMLPort.h"
    4545
    46 namespace orxonox {
    47 
    48 
     46namespace orxonox
     47{
    4948    /**
    5049    @brief

  • code/branches/presentation/src/orxonox/objects/quest/QuestListener.cc

    r2385 r2435  
    2828
    2929/**
    30     @file QuestListener.cc
     30    @file
    3131    @brief Implementation of the QuestListener class.
    3232*/
    … …  
    4242#include "QuestManager.h"
    4343
    44 namespace orxonox {
    45 
     44namespace orxonox
     45{
    4646    CreateFactory(QuestListener);
    4747
    … …  
    152152        {
    153153            COUT(2) << "QuestListener with invalid mode '" << mode << "' created. Mode set to 'all'." << std::endl;
    154             this->mode_ = questListenerMode::all;
    155             return false;
     154        this->mode_ = questListenerMode::all;
     155        return false;
    156156        }
    157157       
    … …  
    186186        {
    187187            COUT(1) << "An unforseen, never to happen, Error has occured. This is impossible!" << std::endl;
    188             return "";
     188        return "";
    189189        }
    190190    }

  • code/branches/presentation/src/orxonox/objects/quest/QuestListener.h

    r2385 r2435  
    2828
    2929/**
    30     @file QuestListener.h
     30    @file
    3131    @brief Definition of the QuestListener class.
    3232*/
    … …  
    4444#include "Quest.h"
    4545
    46 namespace questListenerMode
     46namespace orxonox
    4747{
     48    namespace questListenerMode
     49    {
    4850
    49     //! The mode of the QuestListener.
    50     enum Enum
    51     {
    52         all,
    53         start,
    54         fail,
    55         complete
    56     };
     51        //! The mode of the QuestListener.
     52        enum Enum
     53        {
     54            all,
     55            start,
     56            fail,
     57            complete
     58        };
    5759
    58 }
    59 
    60 namespace orxonox {
     60    }
    6161
    6262    /**
    … …  
    7575        </BaseObject>
    7676    @author
    77         Damian 'Mozork' Frick
     77    Damian 'Mozork' Frick
    7878    */
    7979    class _OrxonoxExport QuestListener : public BaseObject
    8080    {
    81         public:
    82             QuestListener(BaseObject* creator);
    83             virtual ~QuestListener();
    84            
    85             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestListener object through XML.
    86            
    87             static void advertiseStatusChange(std::list<QuestListener*> & listeners, const std::string & status); //!< Makes all QuestListener in the list aware that a certain status change has occured.
    88            
    89             bool setQuestId(const std::string & id); //!< Sets the questId of the Quest the QuestListener reacts to.
    90             bool setMode(const std::string & mode); //!< Sets the mode of the QuestListener.
    91            
    92             const std::string getMode(void); //!< Get the mode of the QuestListener.
    93            
    94             /**
    95             @brief Get the questId of the Quest the QuestListener reacts to.
    96             @return Returns the questId of the Quest the QuestListener reacts to.
    97             */
    98             inline const std::string & getQuestId(void)
     81    public:
     82        QuestListener(BaseObject* creator);
     83        virtual ~QuestListener();
     84       
     85        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestListener object through XML.
     86       
     87        static void advertiseStatusChange(std::list<QuestListener*> & listeners, const std::string & status); //!< Makes all QuestListener in the list aware that a certain status change has occured.
     88       
     89        bool setQuestId(const std::string & id); //!< Sets the questId of the Quest the QuestListener reacts to.
     90        bool setMode(const std::string & mode); //!< Sets the mode of the QuestListener.
     91       
     92        const std::string getMode(void); //!< Get the mode of the QuestListener.
     93       
     94        /**
     95        @brief Get the questId of the Quest the QuestListener reacts to.
     96        @return Returns the questId of the Quest the QuestListener reacts to.
     97        */
     98        inline const std::string & getQuestId(void)
    9999                { return this->quest_->getId(); }
    100            
    101             bool execute(void); //!< Executes the QuestListener, resp. fires an Event.
    102            
    103         private:
    104             questListenerMode::Enum mode_; //!< The mode of the QuestListener.
    105             Quest* quest_; //!< A pointer to the Quest the QuestListener is reacting to.
     100       
     101        bool execute(void); //!< Executes the QuestListener, resp. fires an Event.
     102       
     103    private:
     104        questListenerMode::Enum mode_; //!< The mode of the QuestListener.
     105        Quest* quest_; //!< A pointer to the Quest the QuestListener is reacting to.
    106106   
    107107    };

  • code/branches/presentation/src/orxonox/objects/quest/QuestManager.cc

    r2420 r2435  
    2828
    2929/**
    30     @file QuestManager.cc
     30    @file
    3131    @brief Implementation of the QuestManager class.
    3232*/
    … …  
    4141#include "QuestHint.h"
    4242
    43 namespace orxonox {
    44 
     43namespace orxonox
     44{
    4545    //! All Quests registered by their id's.
    4646    std::map<std::string, Quest*> QuestManager::questMap_s;

  • code/branches/presentation/src/orxonox/objects/quest/QuestManager.h

    r2420 r2435  
    2828
    2929/**
    30     @file QuestManager.h
     30    @file
    3131    @brief Definition of the QuestManager class.
    3232*/
    … …  
    4242#include "core/BaseObject.h"
    4343
    44 namespace orxonox {
    45 
     44namespace orxonox
     45{
    4646    /**
    4747    @brief

  • code/branches/presentation/src/orxonox/objects/quest/Rewardable.cc

    r2420 r2435  
    2828
    2929/**
    30     @file Rewardable.cc
     30    @file
    3131    @brief Implementation of the Rewardable class.
    3232*/
    … …  
    3737#include "core/CoreIncludes.h"
    3838
    39 namespace orxonox {
    40 
     39namespace orxonox
     40{
    4141    /**
    4242    @brief

  • code/branches/presentation/src/orxonox/objects/quest/Rewardable.h

    r2420 r2435  
    2828
    2929/**
    30     @file Rewardable.h
     30    @file
    3131    @brief Definition of the Rewardable class.
    3232*/
    … …  
    3939#include "core/BaseObject.h"
    4040
    41 namespace orxonox {
    42 
     41namespace orxonox
     42{
    4343    /**
    4444    @brief
    … …  
    5151    class _OrxonoxExport Rewardable : public BaseObject
    5252    {
    53 
    5453        public:
    5554            Rewardable(BaseObject* creator);

  • code/branches/presentation/src/orxonox/objects/worldentities/Planet.cc

    r2420 r2435  
    2727 */
    2828
    29 
    3029#include "OrxonoxStableHeaders.h"
    3130#include "Planet.h"
    3231
    33 #include "tinyxml/tinyxml.h"
    34 #include "core/CoreIncludes.h"
    35 #include "GraphicsEngine.h"
    36 #include "core/XMLPort.h"
    37 #include "CameraManager.h"
    38 #include "objects/Scene.h"
    39 #include "Camera.h"
    4032#include <math.h>
    4133
    … …  
    4537#include <OgreMeshManager.h>
    4638
     39#include "core/CoreIncludes.h"
     40#include "core/XMLPort.h"
     41#include "objects/Scene.h"
     42#include "CameraManager.h"
     43#include "Camera.h"
     44#include "GraphicsEngine.h"
    4745
    4846namespace orxonox
    … …  
    6765            this->getNode()->detachObject(this->mesh_.getEntity());
    6866    }   
    69    
     67
    7068    void Planet::tick(float dt)
    7169    {
    7270        if(!this->isVisible())
    7371            return;
    74            
     72
    7573        Camera* activeCamera = CameraManager::getInstance().getActiveCamera();
    76         if(activeCamera)
    77         {
     74        if(activeCamera)
     75        {
    7876            Real distance = this->getPosition().distance( activeCamera->getWorldPosition() );
    79 //             COUT(2) << distance << std::endl;
     77            //             COUT(2) << distance << std::endl;
    8078            Real planetRadius = this->getScale();
    81        
     79
    8280            Real newScale = 2 * distance / sqrt(distance*distance - planetRadius*planetRadius);
    8381            Real tempTest = newScale*(1+Real(this->atmosphereSize)/Real(this->imageSize));
    8482            newScale = tempTest;
    85        
     83
    8684            this->billboard_.getBillboardSet()->setDefaultDimensions(newScale, newScale);
    87         }
    88                
     85        }
     86
    8987        SUPER(Planet, tick, dt);
    9088    }
    91  
    92     void Planet::init(){
    93    
     89
     90    void Planet::init()
     91    {
    9492        Real scaleFactor = this->getScale();
    95        
     93
    9694        this->distList.push_back(10.0*scaleFactor);
    9795        this->distList.push_back(19.0*scaleFactor);
    … …  
    104102        this->distList.push_back(54.0*scaleFactor);
    105103        this->distList.push_back(55.0*scaleFactor);
    106        
     104
    107105        Real reductionValue = 0.2;
    108        
     106
    109107        this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);
    110108        billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
    111        
     109
    112110        this->getNode()->attachObject(this->billboard_.getBillboardSet());   
    113111        this->billboard_.getBillboardSet()->setUseAccurateFacing(true);
    … …  
    116114        this->mesh_.setCastShadows(true);
    117115    }
    118    
     116
    119117    void Planet::changedMesh()
    120118    {
    … …  
    147145    {
    148146        SUPER(Planet, XMLPort, xmlelement, mode);
    149        
     147
    150148        XMLPortParam(Planet, "atmosphere", setAtmosphere, getAtmosphere, xmlelement, mode).defaultValues("planet/Atmosphere");
    151149        XMLPortParam(Planet, "atmospheresize", setAtmosphereSize, getAtmosphereSize, xmlelement,mode);     
    … …  
    153151        XMLPortParam(Planet, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
    154152        XMLPortParam(Planet, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);
    155        
    156153    }
    157154
    158     void Planet::registerVariables(){
     155    void Planet::registerVariables()
     156    {
    159157        registerVariable(this->atmosphere_, variableDirection::toclient);
    160158        registerVariable(this->meshSrc_, variableDirection::toclient, new NetworkCallback<Planet>(this, &Planet::changedMesh));
    … …  
    168166        SUPER(Planet, changedVisibility);
    169167        if (this->isInitialized())
     168        {
    170169            this->mesh_.setVisible(this->isVisible());
    171170            this->billboard_.setVisible(this->isVisible());
     171        }
    172172    }
    173173}

  • code/branches/presentation/src/orxonox/objects/worldentities/Planet.h

    r2420 r2435  
    2929#ifndef _Planet_H__
    3030#define _Planet_H__
    31 #include "tools/BillboardSet.h"
     31
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include "tools/BillboardSet.h"
     35#include "tools/Mesh.h"
    3436#include "MovableEntity.h"
    35 #include "tools/Mesh.h"
    3637#include "objects/Tickable.h"
    3738
    3839namespace orxonox
    3940{
    40 
    4141    class _OrxonoxExport Planet : public MovableEntity
    4242    {

  • code/branches/presentation/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc

    r2262 r2435  
    2828
    2929/**
    30     @file PlayerTrigger.cc
     30    @file
    3131    @brief
    32         Implementation of the PlayerTrigger class.
     32    Implementation of the PlayerTrigger class.
    3333*/
    3434
    … …  
    3838#include "core/CoreIncludes.h"
    3939
    40 namespace orxonox {
    41 
     40namespace orxonox
     41{
    4242    /**
    4343    @brief
    … …  
    4747    {
    4848        RegisterObject(PlayerTrigger);
    49        
     49
    5050        this->player_ = NULL;
    5151        this->isForPlayer_ = true;
    5252    }
    53    
     53
    5454    /**
    5555    @brief
    … …  
    6666    void PlayerTrigger::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    6767    {
    68         SUPER(PlayerTrigger, XMLPort, xmlelement, mode);
     68        SUPER(PlayerTrigger, XMLPort, xmlelement, mode);
    6969    }
    70 
    7170}

  • code/branches/presentation/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h

    r2262 r2435  
    2828
    2929/**
    30     @file PlayerTrigger.h
     30    @file
    3131    @brief
    32         Definition of the PlayerTrigger class.
     32    Definition of the PlayerTrigger class.
    3333*/
    3434
    … …  
    4040#include "Trigger.h"
    4141
    42 namespace orxonox {
    43    
     42namespace orxonox
     43{
    4444    /**
    4545    @brief
    … …  
    5050    class _OrxonoxExport PlayerTrigger : public Trigger
    5151    {
    52         public:
    53             PlayerTrigger(BaseObject* creator);
    54             virtual ~PlayerTrigger();
    55            
    56             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PlayerTrigger object through XML.
     52    public:
     53        PlayerTrigger(BaseObject* creator);
     54        virtual ~PlayerTrigger();
     55       
     56        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PlayerTrigger object through XML.
     57       
     58        /**
     59        @brief Returns the player that triggered the PlayerTrigger.
     60        @return Returns a pointer to the ControllableEntity that triggered the PlayerTrigger.
     61        */
     62        inline ControllableEntity* getTriggeringPlayer(void) const
     63            { return this->player_; }
     64       
     65        /**
     66        @brief Checks whether the PlayerTrigger normally returns a ControllableEntity.
     67        @return Returns true if the PlayerTrigger normally returns a ControllableEntity.
     68        */
     69        inline bool isForPlayer(void) const
     70           { return this->isForPlayer_; }
    5771           
    58             /**
    59             @brief Returns the player that triggered the PlayerTrigger.
    60             @return Returns a pointer to the ControllableEntity that triggered the PlayerTrigger.
    61             */
    62             inline ControllableEntity* getTriggeringPlayer(void) const
    63                 { return this->player_; }
    64            
    65             /**
    66             @brief Checks whether the PlayerTrigger normally returns a ControllableEntity.
    67             @return Returns true if the PlayerTrigger normally returns a ControllableEntity.
    68             */
    69             inline bool isForPlayer(void) const
    70                { return this->isForPlayer_; }
    71            
    72         protected:
    73             virtual bool isTriggered(TriggerMode mode) = 0;
    74            
    75             /**
    76             @brief Set the player that triggered the PlayerTrigger. This is normally done by classes inheriting vom PlayerTrigger.
    77             @param player A pointer to the ControllableEntity that triggered the PlayerTrigger.
    78             */
    79             inline void setTriggeringPlayer(ControllableEntity* player)
    80                { this->player_ = player; }
     72    protected:
     73        virtual bool isTriggered(TriggerMode mode) = 0;
     74       
     75        /**
     76        @brief Set the player that triggered the PlayerTrigger. This is normally done by classes inheriting vom PlayerTrigger.
     77        @param player A pointer to the ControllableEntity that triggered the PlayerTrigger.
     78        */
     79        inline void setTriggeringPlayer(ControllableEntity* player)
     80           { this->player_ = player; }
    8181
    8282            /**
    … …  
    8484            @param isForPlayer Should be true when the PlayerTrigger schould be set to normally be triggered by ControllableEntities, false if not.
    8585            */
    86             inline void setForPlayer(bool isForPlayer)
    87                { this->isForPlayer_ = isForPlayer; }
    88            
    89         private:
    90             ControllableEntity* player_; //!< The player that triggered the PlayerTrigger.
    91             bool isForPlayer_; //!< Is true when the PlayerTrigger schould be set to normally be triggered by ControllableEntities.
    92        
     86        inline void setForPlayer(bool isForPlayer)
     87           { this->isForPlayer_ = isForPlayer; }
     88       
     89    private:
     90        ControllableEntity* player_; //!< The player that triggered the PlayerTrigger.
     91        bool isForPlayer_; //!< Is true when the PlayerTrigger schould be set to normally be triggered by ControllableEntities.
     92   
    9393    };
    9494
Note: See TracChangeset for help on using the changeset viewer.