[Orxonox-commit 1660] r6378 - in code/branches/presentation2/src: libraries/core modules/overlays/hud modules/weapons/projectiles orxonox/gamestates orxonox/sound
rgrieder at orxonox.net
rgrieder at orxonox.net
Fri Dec 18 12:48:19 CET 2009
Author: rgrieder
Date: 2009-12-18 12:48:19 +0100 (Fri, 18 Dec 2009)
New Revision: 6378
Modified:
code/branches/presentation2/src/libraries/core/Game.cc
code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc
code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc
code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h
code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc
code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc
code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc
code/branches/presentation2/src/orxonox/sound/SoundBuffer.h
code/branches/presentation2/src/orxonox/sound/SoundManager.cc
code/branches/presentation2/src/orxonox/sound/SoundStreamer.cc
code/branches/presentation2/src/orxonox/sound/SoundStreamer.h
Log:
Added missing includes (revealed only with PCH and compilations).
Modified: code/branches/presentation2/src/libraries/core/Game.cc
===================================================================
--- code/branches/presentation2/src/libraries/core/Game.cc 2009-12-18 11:29:54 UTC (rev 6377)
+++ code/branches/presentation2/src/libraries/core/Game.cc 2009-12-18 11:48:19 UTC (rev 6378)
@@ -142,7 +142,7 @@
SetConfigValue(statisticsAvgLength_, 1000000)
.description("Sets the time in microseconds interval at which average fps, etc. gets calculated.");
SetConfigValue(fpsLimit_, 50)
- .description("Sets the desired framerate (0 for no limit).");
+ .description("Sets the desired frame rate (0 for no limit).");
}
/**
Modified: code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc 2009-12-18 11:29:54 UTC (rev 6377)
+++ code/branches/presentation2/src/modules/overlays/hud/HUDNavigation.cc 2009-12-18 11:48:19 UTC (rev 6378)
@@ -272,7 +272,7 @@
*/
void HUDNavigation::sizeChanged()
{
- // use size to compensate for apspect ratio if enabled.
+ // use size to compensate for aspect ratio if enabled.
float xScale = this->getActualSize().x;
float yScale = this->getActualSize().y;
if (this->navMarker_)
Modified: code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc 2009-12-18 11:29:54 UTC (rev 6377)
+++ code/branches/presentation2/src/modules/weapons/projectiles/Rocket.cc 2009-12-18 11:48:19 UTC (rev 6378)
@@ -28,16 +28,17 @@
#include "Rocket.h"
+#include <BulletDynamics/Dynamics/btRigidBody.h>
+
+#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
-#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "worldentities/CameraPosition.h"
#include "worldentities/pawns/Pawn.h"
#include "graphics/ParticleSpawner.h"
#include "graphics/Model.h"
#include "objects/collisionshapes/ConeCollisionShape.h"
#include "infos/PlayerInfo.h"
#include "controllers/Controller.h"
-#include "worldentities/CameraPosition.h"
-
#include "sound/WorldSound.h"
namespace orxonox
Modified: code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h
===================================================================
--- code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h 2009-12-18 11:29:54 UTC (rev 6377)
+++ code/branches/presentation2/src/modules/weapons/projectiles/Rocket.h 2009-12-18 11:48:19 UTC (rev 6378)
@@ -30,6 +30,8 @@
#define _Rocket_H__
#include "weapons/WeaponsPrereqs.h"
+
+#include "tools/Timer.h"
#include "worldentities/ControllableEntity.h"
namespace orxonox
Modified: code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc 2009-12-18 11:29:54 UTC (rev 6377)
+++ code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc 2009-12-18 11:48:19 UTC (rev 6378)
@@ -36,6 +36,7 @@
#include "core/Game.h"
#include "core/ConsoleCommand.h"
#include "core/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
#include "core/GraphicsManager.h"
#include "core/GUIManager.h"
#include "Scene.h"
Modified: code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc 2009-12-18 11:29:54 UTC (rev 6377)
+++ code/branches/presentation2/src/orxonox/gamestates/GSRoot.cc 2009-12-18 11:48:19 UTC (rev 6378)
@@ -29,6 +29,7 @@
#include "GSRoot.h"
#include "util/Clock.h"
+#include "core/BaseObject.h"
#include "core/ConsoleCommand.h"
#include "core/Game.h"
#include "core/GameMode.h"
@@ -57,15 +58,15 @@
void GSRoot::printObjects()
{
unsigned int nr=0;
- for(ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it; ++it){
- if( dynamic_cast<Synchronisable*>(*it) )
+ for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it; ++it)
+ {
+ if (dynamic_cast<Synchronisable*>(*it))
COUT(0) << "object: " << it->getIdentifier()->getName() << " id: " << dynamic_cast<Synchronisable*>(*it)->getObjectID() << std::endl;
else
COUT(0) << "object: " << it->getIdentifier()->getName() << std::endl;
nr++;
}
COUT(0) << "currently got " << nr << " objects" << std::endl;
-
}
void GSRoot::activate()
Modified: code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc 2009-12-18 11:29:54 UTC (rev 6377)
+++ code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc 2009-12-18 11:48:19 UTC (rev 6378)
@@ -34,7 +34,6 @@
#include "util/Exception.h"
#include "util/StringUtils.h"
-#include "core/Resource.h"
#include "sound/SoundManager.h"
namespace orxonox
Modified: code/branches/presentation2/src/orxonox/sound/SoundBuffer.h
===================================================================
--- code/branches/presentation2/src/orxonox/sound/SoundBuffer.h 2009-12-18 11:29:54 UTC (rev 6377)
+++ code/branches/presentation2/src/orxonox/sound/SoundBuffer.h 2009-12-18 11:48:19 UTC (rev 6378)
@@ -30,7 +30,10 @@
#define _SoundBuffer_H__
#include "OrxonoxPrereqs.h"
+
+#include <list>
#include <boost/shared_ptr.hpp>
+#include "core/Resource.h"
namespace orxonox
{
Modified: code/branches/presentation2/src/orxonox/sound/SoundManager.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/SoundManager.cc 2009-12-18 11:29:54 UTC (rev 6377)
+++ code/branches/presentation2/src/orxonox/sound/SoundManager.cc 2009-12-18 11:48:19 UTC (rev 6378)
@@ -38,6 +38,7 @@
#include "util/ScopeGuard.h"
#include "util/Clock.h"
#include "core/ConfigValueIncludes.h"
+#include "core/CoreIncludes.h"
#include "core/GameMode.h"
#include "core/ScopedSingletonManager.h"
#include "core/Resource.h"
Modified: code/branches/presentation2/src/orxonox/sound/SoundStreamer.cc
===================================================================
--- code/branches/presentation2/src/orxonox/sound/SoundStreamer.cc 2009-12-18 11:29:54 UTC (rev 6377)
+++ code/branches/presentation2/src/orxonox/sound/SoundStreamer.cc 2009-12-18 11:48:19 UTC (rev 6378)
@@ -25,9 +25,10 @@
*
*/
#include "SoundStreamer.h"
-#include "SoundManager.h"
+
#include <al.h>
#include <vorbis/vorbisfile.h>
+#include "SoundManager.h"
namespace orxonox
{
Modified: code/branches/presentation2/src/orxonox/sound/SoundStreamer.h
===================================================================
--- code/branches/presentation2/src/orxonox/sound/SoundStreamer.h 2009-12-18 11:29:54 UTC (rev 6377)
+++ code/branches/presentation2/src/orxonox/sound/SoundStreamer.h 2009-12-18 11:48:19 UTC (rev 6378)
@@ -32,6 +32,7 @@
#include <string>
#include <OgreDataStream.h>
+#include "core/CorePrereqs.h"
namespace orxonox
{
More information about the Orxonox-commit
mailing list