Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 4, 2007, 5:00:41 PM (18 years ago)
Author:
rgrieder
Message:
  • added namespace Orxonox to every file
    • removed all the "using namespace Ogre" in the header files
  • cleaned up with the includes: attempt to include as little as possible to reduce compile time.
    • created a header file: orxonox_prerequisites.h
    • used OgrePrerequisites in the header files
    • avoided including "Ogre.h", using separate files instead
  • created empty class: AmmunitionDump
File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/main_reto_vs05/src/orxonox.cc

    r159 r161  
    3232*/
    3333
     34#include "OgreRoot.h"
     35#include "OgreTimer.h"
     36#include "OgreWindowEventUtilities.h"
    3437
     38#include "ogre_control.h"
     39#include "run_manager.h"
    3540#include "orxonox.h"
    3641
    3742
    38 /**
    39 * Empty Constructor.
    40 */
    41 Orxonox::Orxonox()
    42 {
    43 }
     43namespace Orxonox {
     44
     45  /**
     46  * Empty Constructor.
     47  */
     48  Orxonox::Orxonox()
     49  {
     50  }
    4451
    4552
    46 /**
    47 * Empty Destructor.
    48 */
    49 Orxonox::~Orxonox()
    50 {
    51 }
     53  /**
     54  * Empty Destructor.
     55  */
     56  Orxonox::~Orxonox()
     57  {
     58  }
    5259
    5360
    54 /**
    55 * Starts and runs the game
    56 */
    57 void Orxonox::go(void)
    58 {
    59         if (!setup())
    60                 return;
     61  /**
     62  * Starts and runs the game
     63  */
     64  void Orxonox::go(void)
     65  {
     66          if (!setup())
     67                  return;
    6168
    62         timer_ = new Timer();
     69    timer_ = new Ogre::Timer();
    6370
    64         unsigned long lastTime = timer_->getMilliseconds();
     71          unsigned long lastTime = timer_->getMilliseconds();
    6572
    66         while (true)
    67         {
    68                 //Pump messages in all registered RenderWindow windows
    69                 WindowEventUtilities::messagePump();
     73          while (true)
     74          {
     75                  //Pump messages in all registered RenderWindow windows
     76      Ogre::WindowEventUtilities::messagePump();
    7077
    71                 ogre_->getRoot()->renderOneFrame();
     78                  ogre_->getRoot()->renderOneFrame();
    7279
    73                 if (!runMgr_->tick(timer_->getMilliseconds(),
    74             (timer_->getMilliseconds() - lastTime) / 1000.0))
    75                         break;
    76                 lastTime = timer_->getMilliseconds();
    77         }
     80                  if (!runMgr_->tick(timer_->getMilliseconds(),
     81              (timer_->getMilliseconds() - lastTime) / 1000.0))
     82                          break;
     83                  lastTime = timer_->getMilliseconds();
     84          }
    7885
    79         // clean up
    80         destroy();
    81 }
     86          // clean up
     87          destroy();
     88  }
    8289
    8390
    84 /**
    85 * Create render engine, render window and the Run manager.
    86 * @return False if failed.
    87 */
    88 bool Orxonox::setup(void)
    89 {
    90         // create new 3D ogre render engine
    91         ogre_ = new OgreControl();
    92         ogre_->initialise();
     91  /**
     92  * Create render engine, render window and the Run manager.
     93  * @return False if failed.
     94  */
     95  bool Orxonox::setup(void)
     96  {
     97          // create new 3D ogre render engine
     98          ogre_ = new OgreControl();
     99          ogre_->initialise();
    93100
    94         runMgr_ = new RunManager(ogre_);
     101          runMgr_ = new RunManager(ogre_);
    95102
    96         return true;
    97 }
     103          return true;
     104  }
    98105
    99106
    100 /**
    101 * Clean everything up.
    102 */
    103 void Orxonox::destroy()
    104 {
    105         if (timer_)
    106                 delete timer_;
    107         if (runMgr_)
    108                 delete runMgr_;
    109         if (ogre_)
    110                 delete ogre_;
     107  /**
     108  * Clean everything up.
     109  */
     110  void Orxonox::destroy()
     111  {
     112          if (timer_)
     113                  delete timer_;
     114          if (runMgr_)
     115                  delete runMgr_;
     116          if (ogre_)
     117                  delete ogre_;
     118  }
     119
    111120}
Note: See TracChangeset for help on using the changeset viewer.