Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 969


Ignore:
Timestamp:
Mar 31, 2008, 10:43:58 PM (16 years ago)
Author:
rgrieder
Message:
  • removed some unnecessary forward declarations
  • renamed destroy() —> destroySingleton()
Location:
code/branches/input/src/orxonox
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • code/branches/input/src/orxonox/GraphicsEngine.cc

    r940 r969  
    6363  GraphicsEngine::~GraphicsEngine()
    6464  {
    65     if (!this->root_)
     65    if (this->root_)
    6666      delete this->root_;
     67    // delete the ogre log and the logManager (sine we have created it).
     68    if (LogManager::getSingletonPtr() != 0)
     69    {
     70      LogManager::getSingleton().getDefaultLog()->removeListener(this);
     71      LogManager::getSingleton().destroyLog(LogManager::getSingleton().getDefaultLog());
     72      delete LogManager::getSingletonPtr();
     73    }
    6774  }
    6875
  • code/branches/input/src/orxonox/GraphicsEngine.h

    r940 r969  
    2828    public:
    2929      GraphicsEngine();
    30       inline void setConfigPath(std::string path) { this->configPath_ = path; };
     30      void setConfigPath(std::string path) { this->configPath_ = path; };
    3131      // find a better way for this
    3232      //inline Ogre::Root* getRoot() { return root_; };
  • code/branches/input/src/orxonox/InputHandler.cc

    r944 r969  
    166166    @brief Destroys the singleton.
    167167  */
    168   void InputHandler::destroy()
     168  void InputHandler::destroySingleton()
    169169  {
    170170    if (singletonRef_s)
     
    179179  void InputHandler::tick(float dt)
    180180  {
     181    //this->mouse_->setEventCallback(this);
    181182    // capture all the input. That calls the event handlers.
    182183    if (mouse_)
     
    251252  bool InputHandler::mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id)
    252253  {
     254    COUT(1) << "asdf" << std::endl;
    253255    return true;
    254256  }
  • code/branches/input/src/orxonox/InputHandler.h

    r934 r969  
    6363
    6464    static InputHandler* getSingleton();
    65     static void destroy();
     65    static void destroySingleton();
    6666
    6767  private:
  • code/branches/input/src/orxonox/Main.cc

    r934 r969  
    8484
    8585    orx->start();
    86     orx->destroy();
     86    orx->destroySingleton();
    8787  }
    8888  catch (std::exception &ex)
  • code/branches/input/src/orxonox/Orxonox.cc

    r945 r969  
    108108      delete this->orxonoxHUD_;
    109109    Loader::close();
    110     InputHandler::destroy();
     110    InputHandler::destroySingleton();
    111111    if (this->auMan_)
    112112      delete this->auMan_;
     
    154154    @brief Destroys the Orxonox singleton.
    155155  */
    156   void Orxonox::destroy()
     156  void Orxonox::destroySingleton()
    157157  {
    158158    if (singletonRef_s)
  • code/branches/input/src/orxonox/Orxonox.h

    r934 r969  
    4444
    4545      static Orxonox* getSingleton();
    46       static void destroy();
     46      static void destroySingleton();
    4747
    4848   private:
  • code/branches/input/src/orxonox/OrxonoxPlatform.h

    r917 r969  
    270270} /* namespace orxonox */
    271271
     272// include visual leak detector to search for memory links
     273// #include <vld.h>
     274
    272275#endif /* _OrxonoxPlatform_H__ */
  • code/branches/input/src/orxonox/OrxonoxStableHeaders.h

    r922 r969  
    4040// including std headers here is useless since they're already precompiled
    4141
    42 // not including the entire Ogre.h doesn't exceed the default heap size for pch
    4342#ifndef WIN32_LEAN_AND_MEAN
    4443// prevent Ogre from including winsock.h that messes with winsock2.h from enet
    4544#  define WIN32_LEAN_AND_MEAN
    4645#endif
     46// not including the entire Ogre.h doesn't exceed the default heap size for pch
    4747//#include <Ogre.h>
    4848#include <OgreBillboardSet.h>
  • code/branches/input/src/orxonox/core/Factory.h

    r871 r969  
    5151namespace orxonox
    5252{
    53     class BaseObject; // Forward declaration
    54 
    5553    // ###############################
    5654    // ###         Factory         ###
  • code/branches/input/src/orxonox/core/Identifier.h

    r917 r969  
    3333     - the name
    3434     - a list with all objects
    35      - parents and childs
     35     - parents and children
    3636     - the factory (if available)
    3737     - the networkID that can be synchronised with the server
     
    6565namespace orxonox
    6666{
    67     class BaseFactory; // Forward declaration
    68     class BaseObject;  // Forward declaration
    69 
    7067    // ###############################
    7168    // ###       Identifier        ###
  • code/branches/input/src/orxonox/core/Tickable.h

    r918 r969  
    4646namespace orxonox
    4747{
    48     //class TickFrameListener; // Forward declaration
    49 
    5048    //! The Tickable interface provides a tick(dt) function, that gets called every frame.
    5149    class _CoreExport Tickable : virtual public OrxonoxClass
  • code/branches/input/src/orxonox/objects/Fighter.h

    r871 r969  
    77
    88#include "Model.h"
    9 
    10 class TiXmlElement; // Forward declaration
    119
    1210namespace orxonox
  • code/branches/input/src/orxonox/objects/Model.h

    r927 r969  
    66#include "WorldEntity.h"
    77#include "../tools/Mesh.h"
    8 
    9 class TiXmlElement; // Forward declaration
    108
    119namespace orxonox
  • code/branches/input/src/orxonox/objects/NPC.h

    r871 r969  
    1111
    1212#include "Model.h"
    13 
    14 class TiXmlElement; // Forward declaration
    1513
    1614namespace orxonox {
  • code/branches/input/src/orxonox/objects/Projectile.h

    r871 r969  
    1010namespace orxonox
    1111{
    12     class SpaceShip; // Forward declaration
    13 
    1412    class _OrxonoxExport Projectile : public WorldEntity
    1513    {
  • code/branches/input/src/orxonox/objects/Skybox.h

    r871 r969  
    55
    66#include "core/BaseObject.h"
    7 
    8 class TiXmlElement; // Forward declaration
    97
    108namespace orxonox
  • code/branches/input/src/orxonox/objects/SpaceShip.h

    r927 r969  
    1010#include "../tools/BillboardSet.h"
    1111
    12 class TiXmlElement;          // Forward declaration
    13 
    1412namespace orxonox
    1513{
    16     class ParticleInterface; // Forward declaration
    17 
    1814    class _OrxonoxExport SpaceShip : public Model, public OIS::MouseListener
    1915    {
Note: See TracChangeset for help on using the changeset viewer.