[Orxonox-commit 654] r3186 - in branches/pch/src/orxonox/objects: gametypes worldentities worldentities/pawns worldentities/triggers
rgrieder at orxonox.net
rgrieder at orxonox.net
Tue Jun 16 14:25:05 CEST 2009
Author: rgrieder
Date: 2009-06-16 14:25:05 +0200 (Tue, 16 Jun 2009)
New Revision: 3186
Modified:
branches/pch/src/orxonox/objects/gametypes/Gametype.cc
branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc
branches/pch/src/orxonox/objects/worldentities/Attacher.h
branches/pch/src/orxonox/objects/worldentities/Backlight.cc
branches/pch/src/orxonox/objects/worldentities/Backlight.h
branches/pch/src/orxonox/objects/worldentities/BigExplosion.cc
branches/pch/src/orxonox/objects/worldentities/BigExplosion.h
branches/pch/src/orxonox/objects/worldentities/Billboard.cc
branches/pch/src/orxonox/objects/worldentities/Billboard.h
branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.cc
branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.h
branches/pch/src/orxonox/objects/worldentities/Camera.cc
branches/pch/src/orxonox/objects/worldentities/Camera.h
branches/pch/src/orxonox/objects/worldentities/CameraPosition.cc
branches/pch/src/orxonox/objects/worldentities/CameraPosition.h
branches/pch/src/orxonox/objects/worldentities/ControllableEntity.cc
branches/pch/src/orxonox/objects/worldentities/ControllableEntity.h
branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.cc
branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.h
branches/pch/src/orxonox/objects/worldentities/FadingBillboard.cc
branches/pch/src/orxonox/objects/worldentities/FadingBillboard.h
branches/pch/src/orxonox/objects/worldentities/ForceField.cc
branches/pch/src/orxonox/objects/worldentities/ForceField.h
branches/pch/src/orxonox/objects/worldentities/Light.cc
branches/pch/src/orxonox/objects/worldentities/Light.h
branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc
branches/pch/src/orxonox/objects/worldentities/MobileEntity.h
branches/pch/src/orxonox/objects/worldentities/Model.cc
branches/pch/src/orxonox/objects/worldentities/Model.h
branches/pch/src/orxonox/objects/worldentities/MovableEntity.cc
branches/pch/src/orxonox/objects/worldentities/MovableEntity.h
branches/pch/src/orxonox/objects/worldentities/ParticleEmitter.cc
branches/pch/src/orxonox/objects/worldentities/ParticleEmitter.h
branches/pch/src/orxonox/objects/worldentities/ParticleSpawner.h
branches/pch/src/orxonox/objects/worldentities/Planet.cc
branches/pch/src/orxonox/objects/worldentities/Planet.h
branches/pch/src/orxonox/objects/worldentities/PongBall.cc
branches/pch/src/orxonox/objects/worldentities/PongBall.h
branches/pch/src/orxonox/objects/worldentities/PongBat.h
branches/pch/src/orxonox/objects/worldentities/PongCenterpoint.h
branches/pch/src/orxonox/objects/worldentities/SpawnPoint.cc
branches/pch/src/orxonox/objects/worldentities/SpawnPoint.h
branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc
branches/pch/src/orxonox/objects/worldentities/TeamSpawnPoint.h
branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc
branches/pch/src/orxonox/objects/worldentities/WorldEntity.h
branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc
branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h
branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc
branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.h
branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.cc
branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.h
branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc
branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h
branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.cc
branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.h
branches/pch/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
branches/pch/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
branches/pch/src/orxonox/objects/worldentities/triggers/EventTrigger.h
branches/pch/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc
branches/pch/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h
branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc
branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.h
Log:
Last part of the cleanup: world entities.
Modified: branches/pch/src/orxonox/objects/gametypes/Gametype.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Gametype.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/gametypes/Gametype.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -32,7 +32,6 @@
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "core/GameMode.h"
-#include "core/ObjectList.h"
#include "objects/infos/PlayerInfo.h"
#include "objects/infos/Bot.h"
@@ -40,6 +39,7 @@
#include "objects/worldentities/ControllableEntity.h"
#include "objects/worldentities/SpawnPoint.h"
#include "objects/worldentities/pawns/Spectator.h"
+#include "objects/worldentities/pawns/Pawn.h"
#include "overlays/OverlayGroup.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -32,6 +32,7 @@
#include "core/ConfigValueIncludes.h"
#include "interfaces/TeamColourable.h"
#include "objects/worldentities/TeamSpawnPoint.h"
+#include "objects/worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Attacher.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Attacher.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Attacher.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -32,9 +32,9 @@
#include "OrxonoxPrereqs.h"
#include <list>
-
+#include <string>
+#include "core/XMLNameListener.h"
#include "objects/worldentities/StaticEntity.h"
-#include "core/XMLNameListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Backlight.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Backlight.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Backlight.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,10 +30,11 @@
#include <OgreRibbonTrail.h>
#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
+#include "util/Exception.h"
+#include "core/CoreIncludes.h"
#include "core/GameMode.h"
-#include "core/CoreIncludes.h"
-#include "core/Executor.h"
#include "core/XMLPort.h"
#include "objects/Scene.h"
Modified: branches/pch/src/orxonox/objects/worldentities/Backlight.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Backlight.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Backlight.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,8 +30,10 @@
#define _Backlight_H__
#include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "interfaces/TimeFactorListener.h"
#include "FadingBillboard.h"
-#include "interfaces/TimeFactorListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/BigExplosion.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/BigExplosion.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/BigExplosion.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -27,21 +27,19 @@
*/
#include "BigExplosion.h"
-#include "MovableEntity.h"
-#include "Model.h"
+//#include <sstream>
#include <OgreParticleSystem.h>
-#include <OgreSceneNode.h>
-#include <sstream>
-#include "core/GameMode.h"
+#include "util/Exception.h"
#include "core/CoreIncludes.h"
-#include "core/Executor.h"
#include "core/CommandExecutor.h"
-#include "objects/Scene.h"
+#include "core/Executor.h"
+#include "core/GameMode.h"
#include "tools/ParticleInterface.h"
+#include "objects/Scene.h"
#include "objects/worldentities/ParticleSpawner.h"
-#include "util/Exception.h"
+#include "Model.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/BigExplosion.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/BigExplosion.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/BigExplosion.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,11 +30,10 @@
#define _BigExplosion_H__
#include "OrxonoxPrereqs.h"
-#include <string>
-
-#include "MovableEntity.h"
+#include <string>
#include "tools/Timer.h"
+#include "MovableEntity.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Billboard.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Billboard.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Billboard.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,8 +31,8 @@
#include <OgreBillboardSet.h>
#include "core/CoreIncludes.h"
+#include "core/GameMode.h"
#include "core/XMLPort.h"
-#include "core/GameMode.h"
#include "objects/Scene.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/Billboard.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Billboard.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Billboard.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,10 +30,11 @@
#define _Billboard_H__
#include "OrxonoxPrereqs.h"
-#include "StaticEntity.h"
+
#include "util/Math.h"
#include "tools/BillboardSet.h"
#include "interfaces/TeamColourable.h"
+#include "StaticEntity.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -28,10 +28,9 @@
#include "BlinkingBillboard.h"
-#include "core/GameMode.h"
#include "core/CoreIncludes.h"
+#include "core/GameMode.h"
#include "core/XMLPort.h"
-#include "util/Math.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,8 +30,10 @@
#define _BlinkingBillboard_H__
#include "OrxonoxPrereqs.h"
+
+#include "util/Math.h"
+#include "interfaces/Tickable.h"
#include "Billboard.h"
-#include "interfaces/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Camera.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Camera.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Camera.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -28,9 +28,6 @@
#include "Camera.h"
-#include <string>
-#include <cassert>
-
#include <OgreCamera.h>
#include <OgreSceneManager.h>
#include <OgreSceneNode.h>
Modified: branches/pch/src/orxonox/objects/worldentities/Camera.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Camera.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Camera.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -32,8 +32,8 @@
#include "OrxonoxPrereqs.h"
#include <OgrePrerequisites.h>
+#include "interfaces/Tickable.h"
#include "objects/worldentities/StaticEntity.h"
-#include "interfaces/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/CameraPosition.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/CameraPosition.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/CameraPosition.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -29,7 +29,6 @@
#include "CameraPosition.h"
#include <OgreCamera.h>
-
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "Camera.h"
Modified: branches/pch/src/orxonox/objects/worldentities/CameraPosition.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/CameraPosition.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/CameraPosition.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,7 +30,6 @@
#define _CameraPosition_H__
#include "OrxonoxPrereqs.h"
-
#include "objects/worldentities/StaticEntity.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/ControllableEntity.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/ControllableEntity.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/ControllableEntity.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -29,12 +29,12 @@
#include "ControllableEntity.h"
#include <OgreSceneManager.h>
+#include <OgreSceneNode.h>
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "core/GameMode.h"
#include "core/XMLPort.h"
-#include "core/Template.h"
#include "objects/Scene.h"
#include "objects/infos/PlayerInfo.h"
Modified: branches/pch/src/orxonox/objects/worldentities/ControllableEntity.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/ControllableEntity.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/ControllableEntity.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,6 +30,10 @@
#define _ControllableEntity_H__
#include "OrxonoxPrereqs.h"
+
+#include <list>
+#include <string>
+#include "util/Math.h"
#include "MobileEntity.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,12 +30,12 @@
#include <OgreParticleSystem.h>
-#include "core/GameMode.h"
#include "core/CoreIncludes.h"
#include "core/Executor.h"
+#include "core/GameMode.h"
+#include "util/Exception.h"
#include "objects/Scene.h"
#include "tools/ParticleInterface.h"
-#include "util/Exception.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include "tools/Timer.h"
#include "MovableEntity.h"
-#include "tools/Timer.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/FadingBillboard.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/FadingBillboard.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/FadingBillboard.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -29,7 +29,6 @@
#include "FadingBillboard.h"
#include "core/CoreIncludes.h"
-#include "core/Executor.h"
#include "core/XMLPort.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/FadingBillboard.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/FadingBillboard.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/FadingBillboard.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,9 +30,11 @@
#define _FadingBillboard_H__
#include "OrxonoxPrereqs.h"
+
+#include "util/Math.h"
+#include "tools/Timer.h"
+#include "interfaces/Tickable.h"
#include "Billboard.h"
-#include "interfaces/Tickable.h"
-#include "tools/Timer.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/ForceField.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/ForceField.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/ForceField.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -27,9 +27,9 @@
*/
#include "ForceField.h"
-#include "core/XMLPort.h"
#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
#include "objects/worldentities/MobileEntity.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/ForceField.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/ForceField.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/ForceField.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,8 +30,10 @@
#ifndef _ForceField_H__
#define _ForceField_H__
+#include "OrxonoxPrereqs.h"
+
+#include "interfaces/Tickable.h"
#include "StaticEntity.h"
-#include "interfaces/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Light.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Light.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Light.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -28,15 +28,14 @@
#include "Light.h"
-#include <sstream>
-#include <cassert>
-
#include <OgreSceneManager.h>
+#include <OgreLight.h>
+#include <boost/static_assert.hpp>
#include "util/String.h"
#include "util/Exception.h"
+#include "core/CoreIncludes.h"
#include "core/GameMode.h"
-#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "objects/Scene.h"
@@ -44,6 +43,11 @@
{
CreateFactory(Light);
+ // Be sure we don't do bad conversions
+ BOOST_STATIC_ASSERT((int)Ogre::Light::LT_POINT == (int)Light::LT_POINT);
+ BOOST_STATIC_ASSERT((int)Ogre::Light::LT_DIRECTIONAL == (int)Light::LT_DIRECTIONAL);
+ BOOST_STATIC_ASSERT((int)Ogre::Light::LT_SPOTLIGHT == (int)Light::LT_SPOTLIGHT);
+
Light::Light(BaseObject* creator) : StaticEntity(creator)
{
RegisterObject(Light);
@@ -51,7 +55,7 @@
this->light_ = 0;
this->diffuse_ = ColourValue::White;
this->specular_ = ColourValue::White;
- this->type_ = Ogre::Light::LT_POINT;
+ this->type_ = Light::LT_POINT;
this->attenuation_ = Vector4(100000, 1, 0, 0);
this->spotlightRange_ = Vector3(40.0f, 30.0f, 1.0f);
@@ -135,24 +139,24 @@
void Light::setTypeString(const std::string& type)
{
if (type == "point")
- this->setType(Ogre::Light::LT_POINT);
+ this->setType(Light::LT_POINT);
else if (type == "directional")
- this->setType(Ogre::Light::LT_DIRECTIONAL);
+ this->setType(Light::LT_DIRECTIONAL);
else if (type == "spotlight")
- this->setType(Ogre::Light::LT_SPOTLIGHT);
+ this->setType(Light::LT_SPOTLIGHT);
else
- this->setType(Ogre::Light::LT_POINT);
+ this->setType(Light::LT_POINT);
}
std::string Light::getTypeString() const
{
switch (this->type_)
{
- case Ogre::Light::LT_DIRECTIONAL:
+ case Light::LT_DIRECTIONAL:
return "directional";
- case Ogre::Light::LT_SPOTLIGHT:
+ case Light::LT_SPOTLIGHT:
return "spotlight";
- case Ogre::Light::LT_POINT:
+ case Light::LT_POINT:
default:
return "point";
}
@@ -162,7 +166,7 @@
{
if (this->light_)
{
- this->light_->setType(this->type_);
+ this->light_->setType(static_cast<Ogre::Light::LightTypes>(this->type_));
if (this->type_ != Ogre::Light::LT_DIRECTIONAL)
this->updateAttenuation();
Modified: branches/pch/src/orxonox/objects/worldentities/Light.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Light.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Light.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,19 +30,28 @@
#define _Light_H__
#include "OrxonoxPrereqs.h"
-#include "StaticEntity.h"
#include <string>
-#include <OgreLight.h>
-
#include "util/Math.h"
#include "interfaces/TeamColourable.h"
+#include "StaticEntity.h"
namespace orxonox
{
class _OrxonoxExport Light : public StaticEntity, public TeamColourable
{
public:
+ enum LightTypes // Copy from the Ogre enum
+ {
+ /// Point light sources give off light equally in all directions, so require only position not direction
+ LT_POINT,
+ /// Directional lights simulate parallel light beams from a distant source, hence have direction but no position
+ LT_DIRECTIONAL,
+ /// Spotlights simulate a cone of light from a source so require position and direction, plus extra values for falloff
+ LT_SPOTLIGHT
+ };
+
+ public:
Light(BaseObject* creator);
virtual ~Light();
@@ -54,9 +63,9 @@
inline Ogre::Light* getLight()
{ return this->light_; }
- inline void setType(Ogre::Light::LightTypes type)
+ inline void setType(Light::LightTypes type)
{ this->type_ = type; this->updateType(); }
- inline Ogre::Light::LightTypes getType() const
+ inline Light::LightTypes getType() const
{ return this->type_; }
inline void setDiffuseColour(const ColourValue& colour)
@@ -132,7 +141,7 @@
void updateSpotlightRange();
Ogre::Light* light_;
- Ogre::Light::LightTypes type_;
+ LightTypes type_;
ColourValue diffuse_;
ColourValue specular_;
Vector4 attenuation_;
Modified: branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,10 +31,8 @@
#include <OgreSceneNode.h>
#include <BulletDynamics/Dynamics/btRigidBody.h>
-#include "util/MathConvert.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-
#include "objects/Scene.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/MobileEntity.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/MobileEntity.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/MobileEntity.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,8 +31,9 @@
#include "OrxonoxPrereqs.h"
+#include "util/Math.h"
+#include "interfaces/Tickable.h"
#include "WorldEntity.h"
-#include "interfaces/Tickable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Model.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Model.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Model.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -26,11 +26,12 @@
*
*/
+#include "Model.h"
#include <OgreEntity.h>
-#include "Model.h"
+
+#include "core/CoreIncludes.h"
#include "core/GameMode.h"
-#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "objects/Scene.h"
Modified: branches/pch/src/orxonox/objects/worldentities/Model.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Model.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Model.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,8 +30,10 @@
#define _Model_H__
#include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "tools/Mesh.h"
#include "StaticEntity.h"
-#include "tools/Mesh.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/MovableEntity.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/MovableEntity.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/MovableEntity.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,9 +30,9 @@
#include "MovableEntity.h"
#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
#include "core/Executor.h"
#include "core/GameMode.h"
+#include "core/XMLPort.h"
#include "objects/worldentities/pawns/Pawn.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/MovableEntity.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/MovableEntity.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/MovableEntity.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -32,9 +32,10 @@
#include "OrxonoxPrereqs.h"
-#include "MobileEntity.h"
+#include "util/Math.h"
#include "network/ClientConnectionListener.h"
#include "tools/Timer.h"
+#include "MobileEntity.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/ParticleEmitter.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/ParticleEmitter.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/ParticleEmitter.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -35,11 +35,11 @@
#include <OgreParticleSystem.h>
-#include "tools/ParticleInterface.h"
#include "util/Exception.h"
+#include "core/CoreIncludes.h"
#include "core/GameMode.h"
-#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
+#include "tools/ParticleInterface.h"
#include "objects/Scene.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/ParticleEmitter.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/ParticleEmitter.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/ParticleEmitter.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,6 +30,8 @@
#define _ParticleEmitter_H__
#include "OrxonoxPrereqs.h"
+
+#include <string>
#include "StaticEntity.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/ParticleSpawner.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/ParticleSpawner.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/ParticleSpawner.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include "tools/Timer.h"
#include "ParticleEmitter.h"
-#include "tools/Timer.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Planet.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Planet.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Planet.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -28,19 +28,16 @@
#include "Planet.h"
-#include <math.h>
-
#include <OgreEntity.h>
#include <OgreBillboardSet.h>
-#include <OgreHardwareVertexBuffer.h>
-#include <OgreMeshManager.h>
+#include <OgreProgressiveMesh.h>
#include "core/CoreIncludes.h"
+#include "core/GameMode.h"
#include "core/XMLPort.h"
#include "objects/Scene.h"
-#include "CameraManager.h"
#include "Camera.h"
-#include "GraphicsManager.h"
+#include "CameraManager.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/Planet.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Planet.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/Planet.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,12 +31,10 @@
#include "OrxonoxPrereqs.h"
-#include <OgreMesh.h>
-
+#include <string>
#include "tools/BillboardSet.h"
#include "tools/Mesh.h"
#include "MovableEntity.h"
-#include "interfaces/Tickable.h"
namespace orxonox
{
@@ -107,7 +105,7 @@
Mesh mesh_;
float atmosphereSize;
float imageSize;
- Ogre::Mesh::LodDistanceList distList;
+ std::vector<float> distList;
BillboardSet billboard_;
bool bCastShadows_;
Modified: branches/pch/src/orxonox/objects/worldentities/PongBall.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/PongBall.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/PongBall.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,6 +31,7 @@
#include "core/CoreIncludes.h"
#include "core/GameMode.h"
#include "objects/gametypes/Gametype.h"
+#include "objects/worldentities/PongBat.h"
#include "sound/SoundBase.h"
namespace orxonox
@@ -216,4 +217,21 @@
this->setVelocity(velocity);
}
}
+
+ void PongBall::setBats(PongBat** bats)
+ {
+ this->bat_ = bats;
+ this->batID_[0] = this->bat_[0]->getObjectID();
+ this->batID_[1] = this->bat_[1]->getObjectID();
+ }
+
+ void PongBall::applyBats()
+ {
+ 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]));
+ }
}
Modified: branches/pch/src/orxonox/objects/worldentities/PongBall.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/PongBall.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/PongBall.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,8 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include "util/Math.h"
#include "objects/worldentities/MovableEntity.h"
-#include "objects/worldentities/PongBat.h"
namespace orxonox
{
@@ -62,12 +62,9 @@
float getBatLength() const
{ return this->batlength_; }
- void setBats(PongBat** bats)
- { this->bat_ = bats; this->batID_[0] = this->bat_[0]->getObjectID(); this->batID_[1] = this->bat_[1]->getObjectID(); }
+ void setBats(PongBat** bats);
+ void applyBats();
- void applyBats()
- { 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])); }
-
static const float MAX_REL_Z_VELOCITY;
private:
Modified: branches/pch/src/orxonox/objects/worldentities/PongBat.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/PongBat.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/PongBat.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,7 +30,6 @@
#define _PongBat_H__
#include "OrxonoxPrereqs.h"
-
#include "objects/worldentities/ControllableEntity.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/PongCenterpoint.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/PongCenterpoint.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/PongCenterpoint.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,6 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include <string>
+#include <util/Math.h>
#include "objects/worldentities/StaticEntity.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/SpawnPoint.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/SpawnPoint.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/SpawnPoint.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -29,8 +29,10 @@
#include "SpawnPoint.h"
#include "core/CoreIncludes.h"
+#include "core/Template.h"
#include "core/XMLPort.h"
#include "objects/gametypes/Gametype.h"
+#include "objects/worldentities/pawns/Pawn.h"
namespace orxonox
{
@@ -70,6 +72,12 @@
this->template_ = Template::getTemplate(name);
}
+ void SpawnPoint::setTemplate(Template* temp)
+ {
+ this->template_ = temp;
+ this->templatename_ = temp->getName();
+ }
+
Pawn* SpawnPoint::spawn()
{
Pawn* entity = this->spawnclass_.fabricate(this);
Modified: branches/pch/src/orxonox/objects/worldentities/SpawnPoint.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/SpawnPoint.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/SpawnPoint.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,9 +31,8 @@
#include "OrxonoxPrereqs.h"
+#include <string>
#include "core/Identifier.h"
-#include "core/Template.h"
-#include "objects/worldentities/pawns/Pawn.h"
#include "objects/worldentities/StaticEntity.h"
namespace orxonox
@@ -51,8 +50,7 @@
inline Identifier* getSpawnClass() const
{ return this->spawnclass_; }
- inline void setTemplate(Template* temp)
- { this->template_ = temp; this->templatename_ = temp->getName(); }
+ void setTemplate(Template* temp);
inline Template* getTemplate() const
{ return this->template_; }
Modified: branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/StaticEntity.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,7 +31,6 @@
#include <OgreSceneNode.h>
#include <BulletDynamics/Dynamics/btRigidBody.h>
-
#include "util/OrxAssert.h"
#include "core/CoreIncludes.h"
Modified: branches/pch/src/orxonox/objects/worldentities/TeamSpawnPoint.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/TeamSpawnPoint.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/TeamSpawnPoint.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,6 +31,7 @@
#include "OrxonoxPrereqs.h"
+#include "objects/worldentities/pawns/Pawn.h"
#include "SpawnPoint.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/WorldEntity.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -29,7 +29,6 @@
#include "WorldEntity.h"
-#include <cassert>
#include <OgreSceneNode.h>
#include <OgreSceneManager.h>
#include <BulletDynamics/Dynamics/btRigidBody.h>
@@ -37,9 +36,9 @@
#include "util/OrxAssert.h"
#include "util/Convert.h"
+#include "util/Exception.h"
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-
#include "objects/Scene.h"
#include "objects/collisionshapes/WorldEntityCollisionShape.h"
@@ -506,7 +505,7 @@
}
// Note: These functions are placed in WorldEntity.h as inline functions for the release build.
-#ifndef NDEBUG
+#ifndef ORXONOX_RELEASE
const Vector3& WorldEntity::getPosition() const
{
return this->node_->getPosition();
Modified: branches/pch/src/orxonox/objects/worldentities/WorldEntity.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/WorldEntity.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/WorldEntity.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -32,7 +32,7 @@
#include "OrxonoxPrereqs.h"
-#ifdef NDEBUG
+#ifdef ORXONOX_RELEASE
#include <OgreSceneNode.h>
#else
#include <OgrePrerequisites.h>
@@ -442,7 +442,7 @@
};
// Inline heavily used functions for release builds. In debug, we better avoid including OgreSceneNode here.
-#ifdef NDEBUG
+#ifdef ORXONOX_RELEASE
inline const Vector3& WorldEntity::getPosition() const
{ return this->node_->getPosition(); }
inline const Quaternion& WorldEntity::getOrientation() const
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -28,24 +28,23 @@
#include "Pawn.h"
-#include "core/GameMode.h"
#include "core/CoreIncludes.h"
+#include "core/GameMode.h"
#include "core/XMLPort.h"
-#include "util/Math.h"
-#include "PawnManager.h"
+#include "network/NetworkFunction.h"
+
#include "interfaces/PawnListener.h"
+#include "PawnManager.h"
#include "objects/infos/PlayerInfo.h"
#include "objects/gametypes/Gametype.h"
#include "objects/worldentities/ParticleSpawner.h"
#include "objects/worldentities/ExplosionChunk.h"
#include "objects/worldentities/BigExplosion.h"
-
#include "objects/weaponsystem/WeaponSystem.h"
#include "objects/weaponsystem/WeaponSlot.h"
#include "objects/weaponsystem/WeaponPack.h"
#include "objects/weaponsystem/WeaponSet.h"
-#include "network/NetworkFunction.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/Pawn.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,8 +30,10 @@
#define _Pawn_H__
#include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "interfaces/RadarViewable.h"
#include "objects/worldentities/ControllableEntity.h"
-#include "interfaces/RadarViewable.h"
#include "objects/pickup/PickupCollection.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,7 +30,6 @@
#include <BulletDynamics/Dynamics/btRigidBody.h>
-#include "util/Math.h"
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "core/Template.h"
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/SpaceShip.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,8 +31,9 @@
#include "OrxonoxPrereqs.h"
+#include <string>
#include <LinearMath/btVector3.h>
-
+#include "util/Math.h"
#include "Pawn.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -33,14 +33,10 @@
#include "core/CoreIncludes.h"
#include "core/ConfigValueIncludes.h"
#include "core/GameMode.h"
-#include "objects/worldentities/Model.h"
+
+#include "tools/BillboardSet.h"
#include "objects/Scene.h"
#include "objects/infos/PlayerInfo.h"
-#include "objects/gametypes/Gametype.h"
-#include "tools/BillboardSet.h"
-#include "overlays/OverlayText.h"
-#include "overlays/OverlayGroup.h"
-#include "util/Convert.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -31,6 +31,7 @@
#include "OrxonoxPrereqs.h"
+#include "util/Math.h"
#include "objects/worldentities/ControllableEntity.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -28,10 +28,11 @@
#include "TeamBaseMatchBase.h"
+
#include "core/CoreIncludes.h"
+#include "interfaces/PawnListener.h"
+#include "interfaces/TeamColourable.h"
#include "objects/gametypes/TeamBaseMatch.h"
-#include "interfaces/TeamColourable.h"
-#include "interfaces/PawnListener.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -29,12 +29,12 @@
#ifndef _TeamBaseMatchBase_H__
#define _TeamBaseMatchBase_H__
+#include "OrxonoxPrereqs.h"
+
#include "Pawn.h"
namespace orxonox
{
-
-
namespace BaseState
{
enum Enum
Modified: branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -30,9 +30,8 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-
#include "objects/gametypes/Asteroids.h"
-#include "orxonox/objects/worldentities/pawns/Pawn.h"
+#include "objects/worldentities/pawns/Pawn.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/CheckPoint.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -34,8 +34,10 @@
#ifndef _CheckPoint_H__
#define _CheckPoint_H__
+#include "OrxonoxPrereqs.h"
+
+#include "interfaces/RadarViewable.h"
#include "DistanceTrigger.h"
-#include "interfaces/RadarViewable.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -28,11 +28,8 @@
#include "DistanceTrigger.h"
-#include <OgreNode.h>
-
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-
#include "orxonox/objects/worldentities/pawns/Pawn.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -29,15 +29,12 @@
#ifndef _DistanceTrigger_H__
#define _DistanceTrigger_H__
-#include "PlayerTrigger.h"
+#include "OrxonoxPrereqs.h"
#include <set>
-
#include "core/ClassTreeMask.h"
-#include "core/BaseObject.h"
+#include "PlayerTrigger.h"
-#include "orxonox/objects/worldentities/ControllableEntity.h"
-
namespace orxonox
{
class _OrxonoxExport DistanceTrigger : public PlayerTrigger
Modified: branches/pch/src/orxonox/objects/worldentities/triggers/EventTrigger.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/EventTrigger.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/EventTrigger.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -29,11 +29,9 @@
#ifndef _EventTrigger_H__
#define _EventTrigger_H__
+#include "OrxonoxPrereqs.h"
#include "Trigger.h"
-#include "core/ClassTreeMask.h"
-#include "core/BaseObject.h"
-
namespace orxonox
{
class _OrxonoxExport EventTrigger : public Trigger
Modified: branches/pch/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -33,7 +33,6 @@
*/
#include "PlayerTrigger.h"
-
#include "core/CoreIncludes.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -36,7 +36,6 @@
#define _PlayerTrigger_H__
#include "OrxonoxPrereqs.h"
-
#include "Trigger.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.cc 2009-06-16 12:25:05 UTC (rev 3186)
@@ -28,12 +28,12 @@
#include "Trigger.h"
-#include <OgreBillboard.h>
#include <OgreBillboardSet.h>
+
#include "core/CoreIncludes.h"
#include "core/ConsoleCommand.h"
+#include "core/GameMode.h"
#include "core/XMLPort.h"
-#include "core/GameMode.h"
#include "objects/Scene.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.h 2009-06-16 10:35:20 UTC (rev 3185)
+++ branches/pch/src/orxonox/objects/worldentities/triggers/Trigger.h 2009-06-16 12:25:05 UTC (rev 3186)
@@ -29,14 +29,14 @@
#ifndef _Trigger_H__
#define _Trigger_H__
+#include "OrxonoxPrereqs.h"
+
#include <set>
#include <queue>
-#include "OrxonoxPrereqs.h"
-
+#include "tools/BillboardSet.h"
#include "interfaces/Tickable.h"
#include "objects/worldentities/StaticEntity.h"
-#include "tools/BillboardSet.h"
namespace orxonox
{
More information about the Orxonox-commit
mailing list