Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3174 for code/branches


Ignore:
Timestamp:
Jun 15, 2009, 9:59:28 AM (15 years ago)
Author:
rgrieder
Message:

Cleanup in orxonox/objects (non recursive).

Location:
code/branches/pch/src/orxonox/objects
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • code/branches/pch/src/orxonox/objects/EventDispatcher.cc

    r3110 r3174  
    3232#include "core/EventIncludes.h"
    3333#include "core/XMLPort.h"
    34 #include "core/EventIncludes.h"
    3534#include "EventTarget.h"
    3635
  • code/branches/pch/src/orxonox/objects/EventDispatcher.h

    r2087 r3174  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
     34#include <list>
    3335#include "core/BaseObject.h"
    3436
  • code/branches/pch/src/orxonox/objects/EventListener.cc

    r3110 r3174  
    3030
    3131#include "core/CoreIncludes.h"
    32 #include "core/EventIncludes.h"
     32#include "core/ObjectList.h"
    3333#include "core/XMLPort.h"
    3434
  • code/branches/pch/src/orxonox/objects/EventListener.h

    r2087 r3174  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
     34#include <string>
    3335#include "core/BaseObject.h"
    3436#include "core/XMLNameListener.h"
  • code/branches/pch/src/orxonox/objects/EventTarget.cc

    r3110 r3174  
    3030
    3131#include "core/CoreIncludes.h"
    32 #include "core/EventIncludes.h"
     32#include "core/ObjectList.h"
    3333
    3434namespace orxonox
  • code/branches/pch/src/orxonox/objects/EventTarget.h

    r2087 r3174  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
    3334#include "core/BaseObject.h"
    3435#include "core/XMLNameListener.h"
  • code/branches/pch/src/orxonox/objects/GametypeMessageListener.cc

    r3099 r3174  
    2828
    2929#include "GametypeMessageListener.h"
    30 
    3130#include "core/CoreIncludes.h"
    3231
  • code/branches/pch/src/orxonox/objects/GametypeMessageListener.h

    r3099 r3174  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 
    3433#include "core/OrxonoxClass.h"
    3534
  • code/branches/pch/src/orxonox/objects/GlobalShader.cc

    r3110 r3174  
    2929#include "GlobalShader.h"
    3030
     31#include "util/Exception.h"
    3132#include "core/CoreIncludes.h"
    3233#include "core/XMLPort.h"
    3334#include "objects/Scene.h"
    34 #include "util/Exception.h"
    3535
    3636namespace orxonox
  • code/branches/pch/src/orxonox/objects/Level.cc

    r3110 r3174  
    2929#include "Level.h"
    3030
     31#include "util/Math.h"
     32#include "core/Core.h"
    3133#include "core/CoreIncludes.h"
     34#include "core/Loader.h"
     35#include "core/Template.h"
     36#include "core/XMLFile.h"
    3237#include "core/XMLPort.h"
    33 #include "core/Loader.h"
    34 #include "core/XMLFile.h"
    35 #include "core/Template.h"
    36 #include "core/Core.h"
    3738
    38 #include "LevelManager.h"
    3939#include "objects/infos/PlayerInfo.h"
    4040#include "objects/gametypes/Gametype.h"
    4141#include "overlays/OverlayGroup.h"
    4242#include "sound/SoundBase.h"
    43 
    44 #include "util/Math.h"
     43#include "LevelManager.h"
    4544
    4645namespace orxonox
  • code/branches/pch/src/orxonox/objects/Level.h

    r3068 r3174  
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include <list>
     35#include <string>
     36#include "core/BaseObject.h"
    3437#include "network/synchronisable/Synchronisable.h"
    35 #include "core/BaseObject.h"
    3638
    3739namespace orxonox
  • code/branches/pch/src/orxonox/objects/Radar.cc

    r3154 r3174  
    2828
    2929/**
    30     @file
    31     @brief
     30@file
     31@brief
    3232*/
    3333
    3434#include "Radar.h"
    35 #include <cfloat>
     35
    3636#include <cassert>
    37 #include "core/CoreIncludes.h"
     37
     38//#include "util/Math.h"
    3839#include "core/ConsoleCommand.h"
    3940#include "core/ObjectList.h"
  • code/branches/pch/src/orxonox/objects/Radar.h

    r3154 r3174  
    2828
    2929/**
    30     @file
    31     @brief
     30@file
     31@brief
    3232*/
    3333
     
    3939#include <map>
    4040#include <string>
    41 #include "core/ObjectList.h"
    42 #include "core/OrxonoxClass.h"
     41
     42#include "core/ObjectListIterator.h"
    4343#include "objects/Tickable.h"
    4444#include "RadarViewable.h"
  • code/branches/pch/src/orxonox/objects/RadarViewable.cc

    r3157 r3174  
    3232#include <OgreSceneNode.h>
    3333#include <OgreEntity.h>
    34 #include <OgreManualObject.h>
    3534
    3635#include "util/Debug.h"
    3736#include "util/String.h"
    3837#include "core/CoreIncludes.h"
    39 #include "orxonox/tools/DynamicLines.h"
     38#include "tools/DynamicLines.h"
    4039#include "objects/worldentities/WorldEntity.h"
    4140#include "objects/Radar.h"
  • code/branches/pch/src/orxonox/objects/RadarViewable.h

    r3157 r3174  
    3434#include <string>
    3535#include <cassert>
     36#include <OgrePrerequisites.h>
    3637
    3738#include "util/Math.h"
  • code/branches/pch/src/orxonox/objects/Scene.cc

    r3164 r3174  
    3131
    3232#include <OgreRoot.h>
     33#include <OgreSceneManager.h>
    3334#include <OgreSceneManagerEnumerator.h>
    3435#include <OgreSceneNode.h>
     
    5859        if (GameMode::showsGraphics())
    5960        {
    60             if (Ogre::Root::getSingletonPtr())
    61             {
    62                 this->sceneManager_ = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC);
    63                 this->rootSceneNode_ = this->sceneManager_->getRootSceneNode();
    64             }
    65             else
    66             {
    67                 this->sceneManager_ = 0;
    68                 this->rootSceneNode_ = 0;
    69             }
     61            assert(Ogre::Root::getSingletonPtr())
     62            this->sceneManager_ = Ogre::Root::getSingleton().createSceneManager(Ogre::ST_GENERIC);
     63            this->rootSceneNode_ = this->sceneManager_->getRootSceneNode();
    7064        }
    7165        else
     
    9488        if (this->isInitialized())
    9589        {
    96             if (Ogre::Root::getSingletonPtr())
    97             {
     90            if (GameMode::showsGraphics())
    9891                Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
    99             }
    100             else if (!GameMode::showsGraphics())
    101             {
     92            else
    10293                delete this->sceneManager_;
    103             }
    10494
    10595            this->setPhysicalWorld(false);
  • code/branches/pch/src/orxonox/objects/Scene.h

    r2662 r3174  
    3333#include "OrxonoxPrereqs.h"
    3434
     35#include <list>
     36#include <set>
     37#include <string>
     38#include <OgrePrerequisites.h>
     39
     40#include "util/Math.h"
     41#include "core/BaseObject.h"
    3542#include "network/synchronisable/Synchronisable.h"
    36 #include "core/BaseObject.h"
    37 #include "util/Math.h"
    3843#include "objects/Tickable.h"
    3944
  • code/branches/pch/src/orxonox/objects/Script.cc

    r3110 r3174  
    2929#include "Script.h"
    3030
     31#include <tinyxml/ticpp.h>
    3132#include "util/Debug.h"
    3233#include "core/CoreIncludes.h"
    33 #include "core/XMLPort.h"
    3434#include "core/LuaBind.h"
    3535
  • code/branches/pch/src/orxonox/objects/Script.h

    r2087 r3174  
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include <string>
    3435#include "core/BaseObject.h"
    3536
  • code/branches/pch/src/orxonox/objects/Teamcolourable.h

    r2826 r3174  
    3232#include "OrxonoxPrereqs.h"
    3333
    34 #include "util/Math.h"
     34#include "util/UtilPrereqs.h"
    3535#include "core/OrxonoxClass.h"
    3636
  • code/branches/pch/src/orxonox/objects/Tickable.cc

    r3110 r3174  
    2929#include "Tickable.h"
    3030#include "core/CoreIncludes.h"
    31 #include "core/ConsoleCommand.h"
    3231
    3332namespace orxonox
Note: See TracChangeset for help on using the changeset viewer.