Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3186


Ignore:
Timestamp:
Jun 16, 2009, 2:25:05 PM (15 years ago)
Author:
rgrieder
Message:

Last part of the cleanup: world entities.

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

Legend:

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

    r3182 r3186  
    3333#include "core/ConfigValueIncludes.h"
    3434#include "core/GameMode.h"
    35 #include "core/ObjectList.h"
    3635
    3736#include "objects/infos/PlayerInfo.h"
     
    4140#include "objects/worldentities/SpawnPoint.h"
    4241#include "objects/worldentities/pawns/Spectator.h"
     42#include "objects/worldentities/pawns/Pawn.h"
    4343#include "overlays/OverlayGroup.h"
    4444
  • code/branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc

    r3183 r3186  
    3333#include "interfaces/TeamColourable.h"
    3434#include "objects/worldentities/TeamSpawnPoint.h"
     35#include "objects/worldentities/pawns/Pawn.h"
    3536
    3637namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/Attacher.h

    r3078 r3186  
    3333
    3434#include <list>
    35 
     35#include <string>
     36#include "core/XMLNameListener.h"
    3637#include "objects/worldentities/StaticEntity.h"
    37 #include "core/XMLNameListener.h"
    3838
    3939namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/Backlight.cc

    r3149 r3186  
    3131#include <OgreRibbonTrail.h>
    3232#include <OgreSceneManager.h>
    33 
     33#include <OgreSceneNode.h>
     34
     35#include "util/Exception.h"
     36#include "core/CoreIncludes.h"
    3437#include "core/GameMode.h"
    35 #include "core/CoreIncludes.h"
    36 #include "core/Executor.h"
    3738#include "core/XMLPort.h"
    3839#include "objects/Scene.h"
  • code/branches/pch/src/orxonox/objects/worldentities/Backlight.h

    r3177 r3186  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
     34#include <string>
     35#include "interfaces/TimeFactorListener.h"
    3336#include "FadingBillboard.h"
    34 #include "interfaces/TimeFactorListener.h"
    3537
    3638namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/BigExplosion.cc

    r3110 r3186  
    2828
    2929#include "BigExplosion.h"
    30 #include "MovableEntity.h"
     30
     31//#include <sstream>
     32#include <OgreParticleSystem.h>
     33
     34#include "util/Exception.h"
     35#include "core/CoreIncludes.h"
     36#include "core/CommandExecutor.h"
     37#include "core/Executor.h"
     38#include "core/GameMode.h"
     39#include "tools/ParticleInterface.h"
     40#include "objects/Scene.h"
     41#include "objects/worldentities/ParticleSpawner.h"
    3142#include "Model.h"
    32 
    33 #include <OgreParticleSystem.h>
    34 #include <OgreSceneNode.h>
    35 #include <sstream>
    36 
    37 #include "core/GameMode.h"
    38 #include "core/CoreIncludes.h"
    39 #include "core/Executor.h"
    40 #include "core/CommandExecutor.h"
    41 #include "objects/Scene.h"
    42 #include "tools/ParticleInterface.h"
    43 #include "objects/worldentities/ParticleSpawner.h"
    44 #include "util/Exception.h"
    4543
    4644namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/BigExplosion.h

    r3087 r3186  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
    3334#include <string>
    34 
    35 
     35#include "tools/Timer.h"
    3636#include "MovableEntity.h"
    37 #include "tools/Timer.h"
    3837
    3938namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/Billboard.cc

    r3110 r3186  
    3232
    3333#include "core/CoreIncludes.h"
     34#include "core/GameMode.h"
    3435#include "core/XMLPort.h"
    35 #include "core/GameMode.h"
    3636#include "objects/Scene.h"
    3737
  • code/branches/pch/src/orxonox/objects/worldentities/Billboard.h

    r3183 r3186  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 #include "StaticEntity.h"
     33
    3434#include "util/Math.h"
    3535#include "tools/BillboardSet.h"
    3636#include "interfaces/TeamColourable.h"
     37#include "StaticEntity.h"
    3738
    3839namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.cc

    r3110 r3186  
    2929#include "BlinkingBillboard.h"
    3030
     31#include "core/CoreIncludes.h"
    3132#include "core/GameMode.h"
    32 #include "core/CoreIncludes.h"
    3333#include "core/XMLPort.h"
    34 #include "util/Math.h"
    3534
    3635namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.h

    r3177 r3186  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
     34#include "util/Math.h"
     35#include "interfaces/Tickable.h"
    3336#include "Billboard.h"
    34 #include "interfaces/Tickable.h"
    3537
    3638namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/Camera.cc

    r3154 r3186  
    2828
    2929#include "Camera.h"
    30 
    31 #include <string>
    32 #include <cassert>
    3330
    3431#include <OgreCamera.h>
  • code/branches/pch/src/orxonox/objects/worldentities/Camera.h

    r3177 r3186  
    3333
    3434#include <OgrePrerequisites.h>
     35#include "interfaces/Tickable.h"
    3536#include "objects/worldentities/StaticEntity.h"
    36 #include "interfaces/Tickable.h"
    3737
    3838namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/CameraPosition.cc

    r3110 r3186  
    3030
    3131#include <OgreCamera.h>
    32 
    3332#include "core/CoreIncludes.h"
    3433#include "core/XMLPort.h"
  • code/branches/pch/src/orxonox/objects/worldentities/CameraPosition.h

    r3089 r3186  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 
    3433#include "objects/worldentities/StaticEntity.h"
    3534
  • code/branches/pch/src/orxonox/objects/worldentities/ControllableEntity.cc

    r3110 r3186  
    3030
    3131#include <OgreSceneManager.h>
     32#include <OgreSceneNode.h>
    3233
    3334#include "core/CoreIncludes.h"
     
    3536#include "core/GameMode.h"
    3637#include "core/XMLPort.h"
    37 #include "core/Template.h"
    3838
    3939#include "objects/Scene.h"
  • code/branches/pch/src/orxonox/objects/worldentities/ControllableEntity.h

    r3089 r3186  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
     34#include <list>
     35#include <string>
     36#include "util/Math.h"
    3337#include "MobileEntity.h"
    3438
  • code/branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.cc

    r3110 r3186  
    3131#include <OgreParticleSystem.h>
    3232
    33 #include "core/GameMode.h"
    3433#include "core/CoreIncludes.h"
    3534#include "core/Executor.h"
     35#include "core/GameMode.h"
     36#include "util/Exception.h"
    3637#include "objects/Scene.h"
    3738#include "tools/ParticleInterface.h"
    38 #include "util/Exception.h"
    3939
    4040namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.h

    r2662 r3186  
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include "tools/Timer.h"
    3435#include "MovableEntity.h"
    35 #include "tools/Timer.h"
    3636
    3737namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/FadingBillboard.cc

    r3110 r3186  
    3030
    3131#include "core/CoreIncludes.h"
    32 #include "core/Executor.h"
    3332#include "core/XMLPort.h"
    3433
  • code/branches/pch/src/orxonox/objects/worldentities/FadingBillboard.h

    r3177 r3186  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
     34#include "util/Math.h"
     35#include "tools/Timer.h"
     36#include "interfaces/Tickable.h"
    3337#include "Billboard.h"
    34 #include "interfaces/Tickable.h"
    35 #include "tools/Timer.h"
    3638
    3739namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/ForceField.cc

    r3064 r3186  
    2828
    2929#include "ForceField.h"
    30 #include "core/XMLPort.h"
    3130
    3231#include "core/CoreIncludes.h"
     32#include "core/XMLPort.h"
    3333#include "objects/worldentities/MobileEntity.h"
    3434
  • code/branches/pch/src/orxonox/objects/worldentities/ForceField.h

    r3177 r3186  
    3131#define _ForceField_H__
    3232
     33#include "OrxonoxPrereqs.h"
     34
     35#include "interfaces/Tickable.h"
    3336#include "StaticEntity.h"
    34 #include "interfaces/Tickable.h"
    3537
    3638namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/Light.cc

    r3110 r3186  
    2929#include "Light.h"
    3030
    31 #include <sstream>
    32 #include <cassert>
    33 
    3431#include <OgreSceneManager.h>
     32#include <OgreLight.h>
     33#include <boost/static_assert.hpp>
    3534
    3635#include "util/String.h"
    3736#include "util/Exception.h"
     37#include "core/CoreIncludes.h"
    3838#include "core/GameMode.h"
    39 #include "core/CoreIncludes.h"
    4039#include "core/XMLPort.h"
    4140#include "objects/Scene.h"
     
    4443{
    4544    CreateFactory(Light);
     45
     46    // Be sure we don't do bad conversions
     47    BOOST_STATIC_ASSERT((int)Ogre::Light::LT_POINT       == (int)Light::LT_POINT);
     48    BOOST_STATIC_ASSERT((int)Ogre::Light::LT_DIRECTIONAL == (int)Light::LT_DIRECTIONAL);
     49    BOOST_STATIC_ASSERT((int)Ogre::Light::LT_SPOTLIGHT   == (int)Light::LT_SPOTLIGHT);
    4650
    4751    Light::Light(BaseObject* creator) : StaticEntity(creator)
     
    5256        this->diffuse_ = ColourValue::White;
    5357        this->specular_ = ColourValue::White;
    54         this->type_ = Ogre::Light::LT_POINT;
     58        this->type_ = Light::LT_POINT;
    5559        this->attenuation_ = Vector4(100000, 1, 0, 0);
    5660        this->spotlightRange_ = Vector3(40.0f, 30.0f, 1.0f);
     
    136140    {
    137141        if (type == "point")
    138             this->setType(Ogre::Light::LT_POINT);
     142            this->setType(Light::LT_POINT);
    139143        else if (type == "directional")
    140             this->setType(Ogre::Light::LT_DIRECTIONAL);
     144            this->setType(Light::LT_DIRECTIONAL);
    141145        else if (type == "spotlight")
    142             this->setType(Ogre::Light::LT_SPOTLIGHT);
     146            this->setType(Light::LT_SPOTLIGHT);
    143147        else
    144             this->setType(Ogre::Light::LT_POINT);
     148            this->setType(Light::LT_POINT);
    145149    }
    146150
     
    149153        switch (this->type_)
    150154        {
    151             case Ogre::Light::LT_DIRECTIONAL:
     155            case Light::LT_DIRECTIONAL:
    152156                return "directional";
    153             case Ogre::Light::LT_SPOTLIGHT:
     157            case Light::LT_SPOTLIGHT:
    154158                return "spotlight";
    155             case Ogre::Light::LT_POINT:
     159            case Light::LT_POINT:
    156160            default:
    157161                return "point";
     
    163167        if (this->light_)
    164168        {
    165             this->light_->setType(this->type_);
     169            this->light_->setType(static_cast<Ogre::Light::LightTypes>(this->type_));
    166170
    167171            if (this->type_ != Ogre::Light::LT_DIRECTIONAL)
  • code/branches/pch/src/orxonox/objects/worldentities/Light.h

    r3183 r3186  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 #include "StaticEntity.h"
    3433
    3534#include <string>
    36 #include <OgreLight.h>
    37 
    3835#include "util/Math.h"
    3936#include "interfaces/TeamColourable.h"
     37#include "StaticEntity.h"
    4038
    4139namespace orxonox
     
    4341    class _OrxonoxExport Light : public StaticEntity, public TeamColourable
    4442    {
     43        public:
     44            enum LightTypes // Copy from the Ogre enum
     45            {
     46                /// Point light sources give off light equally in all directions, so require only position not direction
     47                LT_POINT,
     48                /// Directional lights simulate parallel light beams from a distant source, hence have direction but no position
     49                LT_DIRECTIONAL,
     50                /// Spotlights simulate a cone of light from a source so require position and direction, plus extra values for falloff
     51                LT_SPOTLIGHT
     52            };
     53
    4554        public:
    4655            Light(BaseObject* creator);
     
    5564                { return this->light_; }
    5665
    57             inline void setType(Ogre::Light::LightTypes type)
     66            inline void setType(Light::LightTypes type)
    5867                { this->type_ = type; this->updateType(); }
    59             inline Ogre::Light::LightTypes getType() const
     68            inline Light::LightTypes getType() const
    6069                { return this->type_; }
    6170
     
    133142
    134143            Ogre::Light* light_;
    135             Ogre::Light::LightTypes type_;
     144            LightTypes type_;
    136145            ColourValue diffuse_;
    137146            ColourValue specular_;
  • code/branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc

    r3182 r3186  
    3232#include <BulletDynamics/Dynamics/btRigidBody.h>
    3333
    34 #include "util/MathConvert.h"
    3534#include "core/CoreIncludes.h"
    3635#include "core/XMLPort.h"
    37 
    3836#include "objects/Scene.h"
    3937
  • code/branches/pch/src/orxonox/objects/worldentities/MobileEntity.h

    r3177 r3186  
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include "util/Math.h"
     35#include "interfaces/Tickable.h"
    3436#include "WorldEntity.h"
    35 #include "interfaces/Tickable.h"
    3637
    3738namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/Model.cc

    r3110 r3186  
    2727 */
    2828
     29#include "Model.h"
    2930
    3031#include <OgreEntity.h>
    31 #include "Model.h"
     32
     33#include "core/CoreIncludes.h"
    3234#include "core/GameMode.h"
    33 #include "core/CoreIncludes.h"
    3435#include "core/XMLPort.h"
    3536#include "objects/Scene.h"
  • code/branches/pch/src/orxonox/objects/worldentities/Model.h

    r2662 r3186  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
     34#include <string>
     35#include "tools/Mesh.h"
    3336#include "StaticEntity.h"
    34 #include "tools/Mesh.h"
    3537
    3638namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/MovableEntity.cc

    r3110 r3186  
    3131
    3232#include "core/CoreIncludes.h"
    33 #include "core/XMLPort.h"
    3433#include "core/Executor.h"
    3534#include "core/GameMode.h"
     35#include "core/XMLPort.h"
    3636#include "objects/worldentities/pawns/Pawn.h"
    3737
  • code/branches/pch/src/orxonox/objects/worldentities/MovableEntity.h

    r3033 r3186  
    3333#include "OrxonoxPrereqs.h"
    3434
    35 #include "MobileEntity.h"
     35#include "util/Math.h"
    3636#include "network/ClientConnectionListener.h"
    3737#include "tools/Timer.h"
     38#include "MobileEntity.h"
    3839
    3940namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/ParticleEmitter.cc

    r3110 r3186  
    3636#include <OgreParticleSystem.h>
    3737
     38#include "util/Exception.h"
     39#include "core/CoreIncludes.h"
     40#include "core/GameMode.h"
     41#include "core/XMLPort.h"
    3842#include "tools/ParticleInterface.h"
    39 #include "util/Exception.h"
    40 #include "core/GameMode.h"
    41 #include "core/CoreIncludes.h"
    42 #include "core/XMLPort.h"
    4343#include "objects/Scene.h"
    4444
  • code/branches/pch/src/orxonox/objects/worldentities/ParticleEmitter.h

    r2662 r3186  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
     34#include <string>
    3335#include "StaticEntity.h"
    3436
  • code/branches/pch/src/orxonox/objects/worldentities/ParticleSpawner.h

    r3068 r3186  
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include "tools/Timer.h"
    3435#include "ParticleEmitter.h"
    35 #include "tools/Timer.h"
    3636
    3737namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/Planet.cc

    r3175 r3186  
    2929#include "Planet.h"
    3030
    31 #include <math.h>
    32 
    3331#include <OgreEntity.h>
    3432#include <OgreBillboardSet.h>
    35 #include <OgreHardwareVertexBuffer.h>
    36 #include <OgreMeshManager.h>
     33#include <OgreProgressiveMesh.h>
    3734
    3835#include "core/CoreIncludes.h"
     36#include "core/GameMode.h"
    3937#include "core/XMLPort.h"
    4038#include "objects/Scene.h"
     39#include "Camera.h"
    4140#include "CameraManager.h"
    42 #include "Camera.h"
    43 #include "GraphicsManager.h"
    4441
    4542namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/Planet.h

    r3177 r3186  
    3232#include "OrxonoxPrereqs.h"
    3333
    34 #include <OgreMesh.h>
    35 
     34#include <string>
    3635#include "tools/BillboardSet.h"
    3736#include "tools/Mesh.h"
    3837#include "MovableEntity.h"
    39 #include "interfaces/Tickable.h"
    4038
    4139namespace orxonox
     
    108106            float atmosphereSize;
    109107            float imageSize;
    110             Ogre::Mesh::LodDistanceList distList;
     108            std::vector<float> distList;
    111109            BillboardSet billboard_;
    112110            bool bCastShadows_;
  • code/branches/pch/src/orxonox/objects/worldentities/PongBall.cc

    r3110 r3186  
    3232#include "core/GameMode.h"
    3333#include "objects/gametypes/Gametype.h"
     34#include "objects/worldentities/PongBat.h"
    3435#include "sound/SoundBase.h"
    3536
     
    217218        }
    218219    }
     220
     221    void PongBall::setBats(PongBat** bats)
     222    {
     223        this->bat_ = bats;
     224        this->batID_[0] = this->bat_[0]->getObjectID();
     225        this->batID_[1] = this->bat_[1]->getObjectID();
     226    }
     227
     228    void PongBall::applyBats()
     229    {
     230        if (!this->bat_)
     231            this->bat_ = new PongBat*[2];
     232        if (this->batID_[0] != OBJECTID_UNKNOWN)
     233            this->bat_[0] = dynamic_cast<PongBat*>(Synchronisable::getSynchronisable(this->batID_[0]));
     234        if (this->batID_[1] != OBJECTID_UNKNOWN)
     235            this->bat_[1] = dynamic_cast<PongBat*>(Synchronisable::getSynchronisable(this->batID_[1]));
     236    }
    219237}
  • code/branches/pch/src/orxonox/objects/worldentities/PongBall.h

    r3108 r3186  
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include "util/Math.h"
    3435#include "objects/worldentities/MovableEntity.h"
    35 #include "objects/worldentities/PongBat.h"
    3636
    3737namespace orxonox
     
    6363                { return this->batlength_; }
    6464
    65             void setBats(PongBat** bats)
    66             { this->bat_ = bats; this->batID_[0] = this->bat_[0]->getObjectID(); this->batID_[1] = this->bat_[1]->getObjectID(); }
    67 
    68             void applyBats()
    69             { if(!this->bat_) this->bat_ = new PongBat*[2]; if(this->batID_[0] != OBJECTID_UNKNOWN) this->bat_[0] = dynamic_cast<PongBat*>(Synchronisable::getSynchronisable(this->batID_[0])); if(this->batID_[1] != OBJECTID_UNKNOWN) this->bat_[1] = dynamic_cast<PongBat*>(Synchronisable::getSynchronisable(this->batID_[1])); }
     65            void setBats(PongBat** bats);
     66            void applyBats();
    7067
    7168            static const float MAX_REL_Z_VELOCITY;
  • code/branches/pch/src/orxonox/objects/worldentities/PongBat.h

    r2839 r3186  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 
    3433#include "objects/worldentities/ControllableEntity.h"
    3534
  • code/branches/pch/src/orxonox/objects/worldentities/PongCenterpoint.h

    r2826 r3186  
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include <string>
     35#include <util/Math.h>
    3436#include "objects/worldentities/StaticEntity.h"
    3537
  • code/branches/pch/src/orxonox/objects/worldentities/SpawnPoint.cc

    r3110 r3186  
    3030
    3131#include "core/CoreIncludes.h"
     32#include "core/Template.h"
    3233#include "core/XMLPort.h"
    3334#include "objects/gametypes/Gametype.h"
     35#include "objects/worldentities/pawns/Pawn.h"
    3436
    3537namespace orxonox
     
    7173    }
    7274
     75    void SpawnPoint::setTemplate(Template* temp)
     76    {
     77        this->template_ = temp;
     78        this->templatename_ = temp->getName();
     79    }
     80
    7381    Pawn* SpawnPoint::spawn()
    7482    {
  • code/branches/pch/src/orxonox/objects/worldentities/SpawnPoint.h

    r2662 r3186  
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include <string>
    3435#include "core/Identifier.h"
    35 #include "core/Template.h"
    36 #include "objects/worldentities/pawns/Pawn.h"
    3736#include "objects/worldentities/StaticEntity.h"
    3837
     
    5251                { return this->spawnclass_; }
    5352
    54             inline void setTemplate(Template* temp)
    55                 { this->template_ = temp; this->templatename_ = temp->getName(); }
     53            void setTemplate(Template* temp);
    5654            inline Template* getTemplate() const
    5755                { return this->template_; }
  • code/branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc

    r3164 r3186  
    3232#include <OgreSceneNode.h>
    3333#include <BulletDynamics/Dynamics/btRigidBody.h>
    34 
    3534#include "util/OrxAssert.h"
    3635#include "core/CoreIncludes.h"
  • code/branches/pch/src/orxonox/objects/worldentities/TeamSpawnPoint.h

    r2826 r3186  
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include "objects/worldentities/pawns/Pawn.h"
    3435#include "SpawnPoint.h"
    3536
  • code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc

    r3164 r3186  
    3030#include "WorldEntity.h"
    3131
    32 #include <cassert>
    3332#include <OgreSceneNode.h>
    3433#include <OgreSceneManager.h>
     
    3837#include "util/OrxAssert.h"
    3938#include "util/Convert.h"
     39#include "util/Exception.h"
    4040#include "core/CoreIncludes.h"
    4141#include "core/XMLPort.h"
    42 
    4342#include "objects/Scene.h"
    4443#include "objects/collisionshapes/WorldEntityCollisionShape.h"
     
    507506
    508507    // Note: These functions are placed in WorldEntity.h as inline functions for the release build.
    509 #ifndef NDEBUG
     508#ifndef ORXONOX_RELEASE
    510509    const Vector3& WorldEntity::getPosition() const
    511510    {
  • code/branches/pch/src/orxonox/objects/worldentities/WorldEntity.h

    r3165 r3186  
    3333#include "OrxonoxPrereqs.h"
    3434
    35 #ifdef NDEBUG
     35#ifdef ORXONOX_RELEASE
    3636#include <OgreSceneNode.h>
    3737#else
     
    443443
    444444    // Inline heavily used functions for release builds. In debug, we better avoid including OgreSceneNode here.
    445 #ifdef NDEBUG
     445#ifdef ORXONOX_RELEASE
    446446    inline const Vector3& WorldEntity::getPosition() const
    447447        { return this->node_->getPosition(); }
  • code/branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc

    r3177 r3186  
    2929#include "Pawn.h"
    3030
     31#include "core/CoreIncludes.h"
    3132#include "core/GameMode.h"
    32 #include "core/CoreIncludes.h"
    3333#include "core/XMLPort.h"
    34 #include "util/Math.h"
     34#include "network/NetworkFunction.h"
     35
     36#include "interfaces/PawnListener.h"
    3537#include "PawnManager.h"
    36 #include "interfaces/PawnListener.h"
    3738#include "objects/infos/PlayerInfo.h"
    3839#include "objects/gametypes/Gametype.h"
     
    4041#include "objects/worldentities/ExplosionChunk.h"
    4142#include "objects/worldentities/BigExplosion.h"
    42 
    4343#include "objects/weaponsystem/WeaponSystem.h"
    4444#include "objects/weaponsystem/WeaponSlot.h"
     
    4646#include "objects/weaponsystem/WeaponSet.h"
    4747
    48 #include "network/NetworkFunction.h"
    4948
    5049namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h

    r3177 r3186  
    3131
    3232#include "OrxonoxPrereqs.h"
     33
     34#include <string>
     35#include "interfaces/RadarViewable.h"
    3336#include "objects/worldentities/ControllableEntity.h"
    34 #include "interfaces/RadarViewable.h"
    3537#include "objects/pickup/PickupCollection.h"
    3638
  • code/branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

    r3164 r3186  
    3131#include <BulletDynamics/Dynamics/btRigidBody.h>
    3232
    33 #include "util/Math.h"
    3433#include "core/CoreIncludes.h"
    3534#include "core/ConfigValueIncludes.h"
  • code/branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.h

    r3164 r3186  
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include <string>
    3435#include <LinearMath/btVector3.h>
    35 
     36#include "util/Math.h"
    3637#include "Pawn.h"
    3738
  • code/branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.cc

    r3110 r3186  
    3434#include "core/ConfigValueIncludes.h"
    3535#include "core/GameMode.h"
    36 #include "objects/worldentities/Model.h"
     36
     37#include "tools/BillboardSet.h"
    3738#include "objects/Scene.h"
    3839#include "objects/infos/PlayerInfo.h"
    39 #include "objects/gametypes/Gametype.h"
    40 #include "tools/BillboardSet.h"
    41 #include "overlays/OverlayText.h"
    42 #include "overlays/OverlayGroup.h"
    43 #include "util/Convert.h"
    4440
    4541namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.h

    r3053 r3186  
    3232#include "OrxonoxPrereqs.h"
    3333
     34#include "util/Math.h"
    3435#include "objects/worldentities/ControllableEntity.h"
    3536
  • code/branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc

    r3183 r3186  
    2929
    3030#include "TeamBaseMatchBase.h"
     31
    3132#include "core/CoreIncludes.h"
     33#include "interfaces/PawnListener.h"
     34#include "interfaces/TeamColourable.h"
    3235#include "objects/gametypes/TeamBaseMatch.h"
    33 #include "interfaces/TeamColourable.h"
    34 #include "interfaces/PawnListener.h"
    3536
    3637namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h

    r3033 r3186  
    3030#define _TeamBaseMatchBase_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include "Pawn.h"
    3335
    3436namespace orxonox
    3537{
    36 
    37 
    3838    namespace BaseState
    3939    {
  • code/branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.cc

    r3110 r3186  
    3131#include "core/CoreIncludes.h"
    3232#include "core/XMLPort.h"
    33 
    3433#include "objects/gametypes/Asteroids.h"
    35 #include "orxonox/objects/worldentities/pawns/Pawn.h"
     34#include "objects/worldentities/pawns/Pawn.h"
    3635
    3736namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.h

    r3177 r3186  
    3535#define _CheckPoint_H__
    3636
     37#include "OrxonoxPrereqs.h"
     38
     39#include "interfaces/RadarViewable.h"
    3740#include "DistanceTrigger.h"
    38 #include "interfaces/RadarViewable.h"
    3941
    4042namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

    r3110 r3186  
    2929#include "DistanceTrigger.h"
    3030
    31 #include <OgreNode.h>
    32 
    3331#include "core/CoreIncludes.h"
    3432#include "core/XMLPort.h"
    35 
    3633#include "orxonox/objects/worldentities/pawns/Pawn.h"
    3734
  • code/branches/pch/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h

    r3068 r3186  
    3030#define _DistanceTrigger_H__
    3131
    32 #include "PlayerTrigger.h"
     32#include "OrxonoxPrereqs.h"
    3333
    3434#include <set>
    35 
    3635#include "core/ClassTreeMask.h"
    37 #include "core/BaseObject.h"
    38 
    39 #include "orxonox/objects/worldentities/ControllableEntity.h"
     36#include "PlayerTrigger.h"
    4037
    4138namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/triggers/EventTrigger.h

    r2087 r3186  
    3030#define _EventTrigger_H__
    3131
     32#include "OrxonoxPrereqs.h"
    3233#include "Trigger.h"
    33 
    34 #include "core/ClassTreeMask.h"
    35 #include "core/BaseObject.h"
    3634
    3735namespace orxonox
  • code/branches/pch/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc

    r3110 r3186  
    3434
    3535#include "PlayerTrigger.h"
    36 
    3736#include "core/CoreIncludes.h"
    3837
  • code/branches/pch/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h

    r3033 r3186  
    3737
    3838#include "OrxonoxPrereqs.h"
    39 
    4039#include "Trigger.h"
    4140
  • code/branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc

    r3182 r3186  
    2929#include "Trigger.h"
    3030
    31 #include <OgreBillboard.h>
    3231#include <OgreBillboardSet.h>
     32
    3333#include "core/CoreIncludes.h"
    3434#include "core/ConsoleCommand.h"
     35#include "core/GameMode.h"
    3536#include "core/XMLPort.h"
    36 #include "core/GameMode.h"
    3737#include "objects/Scene.h"
    3838
  • code/branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.h

    r3177 r3186  
    3030#define _Trigger_H__
    3131
     32#include "OrxonoxPrereqs.h"
     33
    3234#include <set>
    3335#include <queue>
    3436
    35 #include "OrxonoxPrereqs.h"
    36 
     37#include "tools/BillboardSet.h"
    3738#include "interfaces/Tickable.h"
    3839#include "objects/worldentities/StaticEntity.h"
    39 #include "tools/BillboardSet.h"
    4040
    4141namespace orxonox
Note: See TracChangeset for help on using the changeset viewer.