[Orxonox-commit 660] r3192 - in branches/pch/src: core core/input orxonox orxonox/gamestates orxonox/gui orxonox/interfaces orxonox/objects orxonox/objects/collisionshapes orxonox/objects/controllers orxonox/objects/gametypes orxonox/objects/infos orxonox/objects/weaponsystem orxonox/objects/weaponsystem/projectiles orxonox/objects/worldentities orxonox/objects/worldentities/pawns orxonox/overlays orxonox/overlays/console orxonox/overlays/hud orxonox/overlays/notifications orxonox/overlays/stats orxonox/tools util
rgrieder at orxonox.net
rgrieder at orxonox.net
Thu Jun 18 10:00:16 CEST 2009
Author: rgrieder
Date: 2009-06-18 10:00:15 +0200 (Thu, 18 Jun 2009)
New Revision: 3192
Added:
branches/pch/src/util/OgreForwardRefs.h
Modified:
branches/pch/src/core/Clock.cc
branches/pch/src/core/Clock.h
branches/pch/src/core/ConsoleCommandCompilation.cc
branches/pch/src/core/Core.cc
branches/pch/src/core/Game.cc
branches/pch/src/core/input/InputManager.cc
branches/pch/src/core/input/KeyBinder.cc
branches/pch/src/orxonox/CameraManager.h
branches/pch/src/orxonox/OrxonoxPrereqs.h
branches/pch/src/orxonox/gamestates/GSMainMenu.h
branches/pch/src/orxonox/gui/GUIManager.cc
branches/pch/src/orxonox/gui/GUIManager.h
branches/pch/src/orxonox/interfaces/RadarViewable.cc
branches/pch/src/orxonox/interfaces/RadarViewable.h
branches/pch/src/orxonox/objects/Scene.cc
branches/pch/src/orxonox/objects/Scene.h
branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc
branches/pch/src/orxonox/objects/controllers/AIController.cc
branches/pch/src/orxonox/objects/controllers/PongAI.cc
branches/pch/src/orxonox/objects/gametypes/Gametype.cc
branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc
branches/pch/src/orxonox/objects/infos/HumanPlayer.cc
branches/pch/src/orxonox/objects/weaponsystem/MuzzleFlash.cc
branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc
branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc
branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.cc
branches/pch/src/orxonox/objects/worldentities/Camera.h
branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.cc
branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc
branches/pch/src/orxonox/objects/worldentities/Planet.cc
branches/pch/src/orxonox/objects/worldentities/PongBall.cc
branches/pch/src/orxonox/objects/worldentities/WorldEntity.h
branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.cc
branches/pch/src/orxonox/overlays/OrxonoxOverlay.cc
branches/pch/src/orxonox/overlays/OrxonoxOverlay.h
branches/pch/src/orxonox/overlays/OverlayGroup.h
branches/pch/src/orxonox/overlays/OverlayText.h
branches/pch/src/orxonox/overlays/console/InGameConsole.h
branches/pch/src/orxonox/overlays/hud/HUDBar.cc
branches/pch/src/orxonox/overlays/hud/HUDBar.h
branches/pch/src/orxonox/overlays/hud/HUDNavigation.h
branches/pch/src/orxonox/overlays/hud/HUDRadar.h
branches/pch/src/orxonox/overlays/hud/UnderAttackHealthBar.cc
branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc
branches/pch/src/orxonox/overlays/stats/Stats.h
branches/pch/src/orxonox/tools/BillboardSet.h
branches/pch/src/orxonox/tools/Mesh.h
branches/pch/src/orxonox/tools/ParticleInterface.h
branches/pch/src/orxonox/tools/Shader.cc
branches/pch/src/orxonox/tools/Shader.h
branches/pch/src/util/Convert.h
branches/pch/src/util/Math.h
Log:
Replaced <OgrePrerequisites.h> with "util/OgreForwardRefs.h": I haven't yet realised that OgrePrerequisites.h includes about every single std header by including the OgreMemoryManager.h file.
And while at it, I took care of some type conversions (partially revealed by the missing OgrePrerequisites.h that disabled warnings)
Modified: branches/pch/src/core/Clock.cc
===================================================================
--- branches/pch/src/core/Clock.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/core/Clock.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -56,7 +56,7 @@
unsigned long timersTime = timer_->getMicroseconds();
tickTime_ = storedTime_ + timersTime;
tickDt_ = timersTime - lastTimersTime_;
- tickDtFloat_ = (float)tickDt_ / 1000000.0f;
+ tickDtFloat_ = static_cast<float>(tickDt_ / 1000000.0f);
if (timersTime > 0x7FFFFFF0)
{
Modified: branches/pch/src/core/Clock.h
===================================================================
--- branches/pch/src/core/Clock.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/core/Clock.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -38,7 +38,7 @@
#define _Clock_H__
#include "CorePrereqs.h"
-#include <OgrePrerequisites.h>
+#include "util/OgreForwardRefs.h"
namespace orxonox
{
@@ -52,11 +52,11 @@
unsigned long long getMicroseconds() const { return tickTime_; }
unsigned long long getMilliseconds() const { return tickTime_ / 1000; }
- int getSeconds() const { return tickTime_ / 1000000; }
- float getSecondsPrecise() const { return (float)tickTime_ / 1000000.0f; }
+ unsigned long getSeconds() const { return static_cast<long> (tickTime_ / 1000000); }
+ float getSecondsPrecise() const { return static_cast<float>(tickTime_ / 1000000.0f); }
float getDeltaTime() const { return tickDtFloat_; }
- int getDeltaTimeMicroseconds() const { return tickDt_; }
+ long getDeltaTimeMicroseconds() const { return tickDt_; }
unsigned long long getRealMicroseconds() const;
@@ -66,7 +66,7 @@
Ogre::Timer* timer_;
unsigned long long storedTime_;
unsigned long long tickTime_;
- int tickDt_;
+ long tickDt_;
float tickDtFloat_;
unsigned long lastTimersTime_;
};
Modified: branches/pch/src/core/ConsoleCommandCompilation.cc
===================================================================
--- branches/pch/src/core/ConsoleCommandCompilation.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/core/ConsoleCommandCompilation.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -169,7 +169,7 @@
{
COUT(2) << "Warning: Expression could not be parsed to the end! Remains: '" << expr.getRemains() << "'" << std::endl;
}
- return expr.getResult();
+ return static_cast<float>(expr.getResult());
}
else
{
Modified: branches/pch/src/core/Core.cc
===================================================================
--- branches/pch/src/core/Core.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/core/Core.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -366,7 +366,7 @@
static bool bInitialized = false;
if (!bInitialized && this->bInitializeRandomNumberGenerator_)
{
- srand(time(0));
+ srand(static_cast<unsigned int>(time(0)));
rand();
bInitialized = true;
}
Modified: branches/pch/src/core/Game.cc
===================================================================
--- branches/pch/src/core/Game.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/core/Game.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -189,7 +189,7 @@
(*it)->update(*this->gameClock_);
if ((*it)->getCountTickTime())
- this->addTickTime(this->gameClock_->getRealMicroseconds() - timeBeforeTick);
+ this->addTickTime(static_cast<uint32_t>(this->gameClock_->getRealMicroseconds() - timeBeforeTick));
}
// STATISTICS
@@ -211,8 +211,8 @@
}
uint32_t framesPerPeriod = this->statisticsTickTimes_.size();
- this->avgFPS_ = (float)framesPerPeriod / (currentTime - this->statisticsTickTimes_.front().tickTime) * 1000000.0;
- this->avgTickTime_ = (float)this->periodTickTime_ / framesPerPeriod / 1000.0;
+ this->avgFPS_ = static_cast<float>(framesPerPeriod) / (currentTime - this->statisticsTickTimes_.front().tickTime) * 1000000.0f;
+ this->avgTickTime_ = static_cast<float>(this->periodTickTime_) / framesPerPeriod / 1000.0f;
this->periodTime_ -= this->statisticsRefreshCycle_;
}
Modified: branches/pch/src/core/input/InputManager.cc
===================================================================
--- branches/pch/src/core/input/InputManager.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/core/input/InputManager.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -1165,7 +1165,7 @@
}
else
{
- float fValue = value - joyStickCalibrations_[iJoyStick].middleValue[axis];
+ float fValue = static_cast<float>(value - joyStickCalibrations_[iJoyStick].middleValue[axis]);
if (fValue > 0.0f)
fValue *= joyStickCalibrations_[iJoyStick].positiveCoeff[axis];
else
Modified: branches/pch/src/core/input/KeyBinder.cc
===================================================================
--- branches/pch/src/core/input/KeyBinder.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/core/input/KeyBinder.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -316,14 +316,14 @@
if (mouseRelative_[i] < 0)
{
mouseAxes_[2*i + 0].absVal_
- = -mouseRelative_[i] / deriveTime_ * 0.0005 * mouseSensitivityDerived_;
+ = -mouseRelative_[i] / deriveTime_ * 0.0005f * mouseSensitivityDerived_;
mouseAxes_[2*i + 1].absVal_ = 0.0f;
}
else if (mouseRelative_[i] > 0)
{
mouseAxes_[2*i + 0].absVal_ = 0.0f;
mouseAxes_[2*i + 1].absVal_
- = mouseRelative_[i] / deriveTime_ * 0.0005 * mouseSensitivityDerived_;
+ = mouseRelative_[i] / deriveTime_ * 0.0005f * mouseSensitivityDerived_;
}
else
{
Modified: branches/pch/src/orxonox/CameraManager.h
===================================================================
--- branches/pch/src/orxonox/CameraManager.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/CameraManager.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -39,7 +39,7 @@
#include <cassert>
#include <list>
-#include <OgrePrerequisites.h>
+#include "util/OgreForwardRefs.h"
namespace orxonox
{
Modified: branches/pch/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- branches/pch/src/orxonox/OrxonoxPrereqs.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/OrxonoxPrereqs.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -286,11 +286,6 @@
namespace Ogre
{
- // some got forgotten in OgrePrerequisites
- class BorderPanelOverlayElement;
- class PanelOverlayElement;
- class TextAreaOverlayElement;
-
// OGRE Wiki adapted code
class DynamicLines;
class DynamicRenderable;
Modified: branches/pch/src/orxonox/gamestates/GSMainMenu.h
===================================================================
--- branches/pch/src/orxonox/gamestates/GSMainMenu.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/gamestates/GSMainMenu.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include <OgrePrerequisites.h>
+#include "util/OgreForwardRefs.h"
#include "core/GameState.h"
namespace orxonox
Modified: branches/pch/src/orxonox/gui/GUIManager.cc
===================================================================
--- branches/pch/src/orxonox/gui/GUIManager.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/gui/GUIManager.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -394,11 +394,11 @@
void GUIManager::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
{
- guiSystem_->injectMouseMove(rel.x, rel.y);
+ guiSystem_->injectMouseMove(static_cast<float>(rel.x), static_cast<float>(rel.y));
}
void GUIManager::mouseScrolled(int abs, int rel)
{
- guiSystem_->injectMouseWheelChange(rel);
+ guiSystem_->injectMouseWheelChange(static_cast<float>(rel));
}
/**
Modified: branches/pch/src/orxonox/gui/GUIManager.h
===================================================================
--- branches/pch/src/orxonox/gui/GUIManager.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/gui/GUIManager.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -40,9 +40,9 @@
#include <map>
#include <string>
-#include <OgrePrerequisites.h>
#include <CEGUIForwardRefs.h>
+#include "util/OgreForwardRefs.h"
#include "core/input/InputInterfaces.h"
// tolua_begin
Modified: branches/pch/src/orxonox/interfaces/RadarViewable.cc
===================================================================
--- branches/pch/src/orxonox/interfaces/RadarViewable.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/interfaces/RadarViewable.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -125,7 +125,7 @@
this->MapNode_->setOrientation( this->getWorldEntity()->getOrientation() );
//Vector3 v = this->getRVWorldPosition();
//this->line_->setPoint(1, Vector3(0,v.y,0) );
- this->line_->setPoint(1, Vector3( 0, (int) -Map::getSingletonPtr()->movablePlane_->getDistance( this->getRVWorldPosition() ) ,0 ));
+ this->line_->setPoint(1, Vector3( 0, static_cast<float>(static_cast<int>( -Map::getSingletonPtr()->movablePlane_->getDistance( this->getRVWorldPosition() ) ) ) ,0 ));
this->line_->update();
if( Map::getSingletonPtr()->playerShipNode_ )
this->LineNode_->setDirection( Map::getSingletonPtr()->playerShipNode_->getLocalAxes().GetColumn(1) ,Ogre::Node::TS_WORLD,Vector3::UNIT_Y);
Modified: branches/pch/src/orxonox/interfaces/RadarViewable.h
===================================================================
--- branches/pch/src/orxonox/interfaces/RadarViewable.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/interfaces/RadarViewable.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -33,9 +33,9 @@
#include <string>
#include <cassert>
-#include <OgrePrerequisites.h>
#include "util/Math.h"
+#include "util/OgreForwardRefs.h"
#include "core/OrxonoxClass.h"
namespace orxonox
Modified: branches/pch/src/orxonox/objects/Scene.cc
===================================================================
--- branches/pch/src/orxonox/objects/Scene.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/Scene.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -101,7 +101,7 @@
SUPER(Scene, XMLPort, xmlelement, mode);
XMLPortParam(Scene, "skybox", setSkybox, getSkybox, xmlelement, mode);
- XMLPortParam(Scene, "ambientlight", setAmbientLight, getAmbientLight, xmlelement, mode).defaultValues(ColourValue(0.2, 0.2, 0.2, 1));
+ XMLPortParam(Scene, "ambientlight", setAmbientLight, getAmbientLight, xmlelement, mode).defaultValues(ColourValue(0.2f, 0.2f, 0.2f, 1.0f));
XMLPortParam(Scene, "shadow", setShadow, getShadow, xmlelement, mode).defaultValues(true);
XMLPortParam(Scene, "gravity", setGravity, getGravity, xmlelement, mode);
Modified: branches/pch/src/orxonox/objects/Scene.h
===================================================================
--- branches/pch/src/orxonox/objects/Scene.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/Scene.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -35,9 +35,9 @@
#include <list>
#include <set>
#include <string>
-#include <OgrePrerequisites.h>
#include "util/Math.h"
+#include "util/OgreForwardRefs.h"
#include "core/BaseObject.h"
#include "network/synchronisable/Synchronisable.h"
#include "interfaces/Tickable.h"
Modified: branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc
===================================================================
--- branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/collisionshapes/CollisionShape.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -125,8 +125,8 @@
bool CollisionShape::hasTransform() const
{
- return (!this->position_.positionEquals(Vector3(0, 0, 0), 0.001) ||
- !this->orientation_.equals(Quaternion(1,0,0,0), Degree(0.1)));
+ return (!this->position_.positionEquals(Vector3(0, 0, 0), 0.001f) ||
+ !this->orientation_.equals(Quaternion(1,0,0,0), Degree(0.1f)));
}
void CollisionShape::setScale3D(const Vector3& scale)
Modified: branches/pch/src/orxonox/objects/controllers/AIController.cc
===================================================================
--- branches/pch/src/orxonox/objects/controllers/AIController.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/controllers/AIController.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -107,7 +107,7 @@
if (this->bHasTargetPosition_)
this->moveToTargetPosition();
- if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(Ogre::Math::PI / 20.0))
+ if (this->getControllableEntity() && this->bShooting_ && this->isCloseAtTarget(1000) && this->isLookingAtTarget(Ogre::Math::PI / 20.0f))
this->getControllableEntity()->fire(0);
SUPER(AIController, tick, dt);
Modified: branches/pch/src/orxonox/objects/controllers/PongAI.cc
===================================================================
--- branches/pch/src/orxonox/objects/controllers/PongAI.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/controllers/PongAI.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -38,7 +38,7 @@
{
CreateUnloadableFactory(PongAI);
- const static float MAX_REACTION_TIME = 0.4;
+ const static float MAX_REACTION_TIME = 0.4f;
PongAI::PongAI(BaseObject* creator) : Controller(creator)
{
@@ -48,8 +48,8 @@
this->ballDirection_ = Vector2::ZERO;
this->ballEndPosition_ = 0;
this->randomOffset_ = 0;
- this->relHysteresisOffset_ = 0.02;
- this->strength_ = 0.5;
+ this->relHysteresisOffset_ = 0.02f;
+ this->strength_ = 0.5f;
this->movement_ = 0;
this->oldMove_ = 0;
this->bOscillationAvoidanceActive_ = false;
@@ -170,7 +170,7 @@
// exp < 1 -> position is more likely a large number
// The position shouln't be larger than 0.5 (50% of the bat-length from the middle is the end)
- position *= 0.48;
+ position *= 0.48f;
// Both sides are equally probable
position *= rndsgn();
@@ -189,7 +189,7 @@
this->ballEndPosition_ = position.z + velocity.z / velocity.x * (-position.x + dimension.x / 2 * sgn(velocity.x));
// Calculate bounces
- for (float limit = 0.35; limit < this->strength_ || this->strength_ > 0.99; limit += 0.4)
+ for (float limit = 0.35f; limit < this->strength_ || this->strength_ > 0.99f; limit += 0.4f)
{
// Calculate a random prediction error, based on the vertical speed of the ball and the strength of the AI
float randomError = rnd(-1, 1) * dimension.y * (velocity.z / velocity.x / PongBall::MAX_REL_Z_VELOCITY) * (1 - this->strength_);
Modified: branches/pch/src/orxonox/objects/gametypes/Gametype.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/Gametype.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/gametypes/Gametype.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -286,7 +286,7 @@
{
if (this->spawnpoints_.size() > 0)
{
- unsigned int randomspawn = (unsigned int)rnd(this->spawnpoints_.size());
+ unsigned int randomspawn = static_cast<unsigned int>(rnd(static_cast<float>(this->spawnpoints_.size())));
unsigned int index = 0;
for (std::set<SpawnPoint*>::const_iterator it = this->spawnpoints_.begin(); it != this->spawnpoints_.end(); ++it)
{
Modified: branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc
===================================================================
--- branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/gametypes/TeamDeathmatch.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -53,10 +53,10 @@
static ColourValue colours[] =
{
- ColourValue(1.0, 0.3, 0.3),
- ColourValue(0.3, 0.3, 1.0),
- ColourValue(0.3, 1.0, 0.3),
- ColourValue(1.0, 1.0, 0.0)
+ ColourValue(1.0f, 0.3f, 0.3f),
+ ColourValue(0.3f, 0.3f, 1.0f),
+ ColourValue(0.3f, 1.0f, 0.3f),
+ ColourValue(1.0f, 1.0f, 0.0f)
};
static std::vector<ColourValue> defaultcolours(colours, colours + sizeof(colours) / sizeof(ColourValue));
@@ -138,7 +138,7 @@
if (teamSpawnPoints.size() > 0)
{
- unsigned int randomspawn = (unsigned int)rnd(teamSpawnPoints.size());
+ unsigned int randomspawn = static_cast<unsigned int>(rnd(static_cast<float>(teamSpawnPoints.size())));
unsigned int index = 0;
for (std::set<SpawnPoint*>::const_iterator it = teamSpawnPoints.begin(); it != teamSpawnPoints.end(); ++it)
{
Modified: branches/pch/src/orxonox/objects/infos/HumanPlayer.cc
===================================================================
--- branches/pch/src/orxonox/objects/infos/HumanPlayer.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/infos/HumanPlayer.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -142,12 +142,12 @@
float HumanPlayer::getPing() const
{
- return ClientInformation::findClient(this->getClientID())->getRTT();
+ return static_cast<float>(ClientInformation::findClient(this->getClientID())->getRTT());
}
float HumanPlayer::getPacketLossRatio() const
{
- return ClientInformation::findClient(this->getClientID())->getPacketLoss();
+ return static_cast<float>(ClientInformation::findClient(this->getClientID())->getPacketLoss());
}
void HumanPlayer::setClientID(unsigned int clientID)
Modified: branches/pch/src/orxonox/objects/weaponsystem/MuzzleFlash.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/MuzzleFlash.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/weaponsystem/MuzzleFlash.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -39,7 +39,7 @@
MuzzleFlash::MuzzleFlash(BaseObject* creator) : Billboard(creator)
{
RegisterObject(MuzzleFlash);
- this->setScale(0.1);
+ this->setScale(0.1f);
this->delayTimer_.setTimer(0.1f, false, this, createExecutor(createFunctor(&MuzzleFlash::destroy)));
Modified: branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/weaponsystem/projectiles/BillboardProjectile.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -43,7 +43,7 @@
if (GameMode::showsGraphics())
{
assert(this->getScene()->getSceneManager()); // getScene() was already checked by WorldEntity
- this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(0.5, 0.5, 0.7, 0.8), 1);
+ this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(0.5f, 0.5f, 0.7f, 0.8f), 1);
this->attachOgreObject(this->billboard_.getBillboardSet());
}
Modified: branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc
===================================================================
--- branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/weaponsystem/projectiles/LightningGunProjectile.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -41,7 +41,7 @@
this->textureIndex_ = 1;
this->maxTextureIndex_ = 8;
- this->textureTimer_.setTimer(0.01, true, this, createExecutor(createFunctor(&LightningGunProjectile::changeTexture)));
+ this->textureTimer_.setTimer(0.01f, true, this, createExecutor(createFunctor(&LightningGunProjectile::changeTexture)));
registerVariables();
}
Modified: branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/worldentities/BlinkingBillboard.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -78,9 +78,9 @@
{
this->time_ += dt;
if (this->bQuadratic_)
- this->setScale(this->amplitude_ * square(sin((6.2831853 * this->time_ + this->phase_.valueRadians()) * this->frequency_)));
+ this->setScale(this->amplitude_ * static_cast<float>(square(sin((6.2831853 * this->time_ + this->phase_.valueRadians()) * this->frequency_))));
else
- this->setScale(this->amplitude_ * sin((6.2831853 * this->time_ + this->phase_.valueRadians()) * this->frequency_));
+ this->setScale(this->amplitude_ * static_cast<float>(sin((6.2831853 * this->time_ + this->phase_.valueRadians()) * this->frequency_)));
}
}
}
Modified: branches/pch/src/orxonox/objects/worldentities/Camera.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Camera.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/worldentities/Camera.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include <OgrePrerequisites.h>
+#include "util/OgreForwardRefs.h"
#include "interfaces/Tickable.h"
#include "objects/worldentities/StaticEntity.h"
Modified: branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/worldentities/ExplosionChunk.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -150,12 +150,12 @@
Vector3 change(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1));
change.normalise();
- change *= rnd(0.4, 0.8);
+ change *= rnd(0.4f, 0.8f);
Vector3 velocity = this->getVelocity();
velocity.normalise();
velocity += change;
velocity.normalise();
- velocity *= length * rnd(0.8, 1.0);
+ velocity *= length * rnd(0.8f, 1.0f);
this->setVelocity(velocity);
}
Modified: branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/worldentities/MobileEntity.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -91,7 +91,7 @@
this->angularVelocity_.y += angularAcceleration_.y * dt;
this->angularVelocity_.z += angularAcceleration_.z * dt;
// Calculate new orientation with quaternion derivative. This is about 30% faster than with angle/axis method.
- float mult = dt * 0.5;
+ float mult = dt * 0.5f;
// TODO: this could be optimized by writing it out. The calls currently create 4 new Quaternions!
Quaternion newOrientation(0.0f, this->angularVelocity_.x * mult, this->angularVelocity_.y * mult, this->angularVelocity_.z * mult);
newOrientation = this->node_->getOrientation() + newOrientation * this->node_->getOrientation();
Modified: branches/pch/src/orxonox/objects/worldentities/Planet.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/Planet.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/worldentities/Planet.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -90,18 +90,18 @@
{
float scaleFactor = this->getScale();
- this->distList.push_back(10.0*scaleFactor);
- this->distList.push_back(19.0*scaleFactor);
- this->distList.push_back(27.0*scaleFactor);
- this->distList.push_back(34.0*scaleFactor);
- this->distList.push_back(40.0*scaleFactor);
- this->distList.push_back(45.0*scaleFactor);
- this->distList.push_back(49.0*scaleFactor);
- this->distList.push_back(52.0*scaleFactor);
- this->distList.push_back(54.0*scaleFactor);
- this->distList.push_back(55.0*scaleFactor);
+ this->distList.push_back(10.0f*scaleFactor);
+ this->distList.push_back(19.0f*scaleFactor);
+ this->distList.push_back(27.0f*scaleFactor);
+ this->distList.push_back(34.0f*scaleFactor);
+ this->distList.push_back(40.0f*scaleFactor);
+ this->distList.push_back(45.0f*scaleFactor);
+ this->distList.push_back(49.0f*scaleFactor);
+ this->distList.push_back(52.0f*scaleFactor);
+ this->distList.push_back(54.0f*scaleFactor);
+ this->distList.push_back(55.0f*scaleFactor);
- float reductionValue = 0.2;
+ float reductionValue = 0.2f;
this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);
billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
Modified: branches/pch/src/orxonox/objects/worldentities/PongBall.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/PongBall.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/worldentities/PongBall.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -49,7 +49,7 @@
this->batID_ = new unsigned int[2];
this->batID_[0] = OBJECTID_UNKNOWN;
this->batID_[1] = OBJECTID_UNKNOWN;
- this->relMercyOffset_ = 0.05;
+ this->relMercyOffset_ = 0.05f;
this->registerVariables();
@@ -102,7 +102,7 @@
{
if (position.x > this->fieldWidth_ / 2 && this->bat_[1])
{
- distance = (position.z - this->bat_[1]->getPosition().z) / (this->fieldHeight_ * (this->batlength_ * 1.10) / 2);
+ distance = (position.z - this->bat_[1]->getPosition().z) / (this->fieldHeight_ * (this->batlength_ * 1.10f) / 2);
if (fabs(distance) <= 1)
{
position.x = this->fieldWidth_ / 2;
@@ -122,7 +122,7 @@
}
if (position.x < -this->fieldWidth_ / 2 && this->bat_[0])
{
- distance = (position.z - this->bat_[0]->getPosition().z) / (this->fieldHeight_ * (this->batlength_ * 1.10) / 2);
+ distance = (position.z - this->bat_[0]->getPosition().z) / (this->fieldHeight_ * (this->batlength_ * 1.10f) / 2);
if (fabs(distance) <= 1)
{
position.x = -this->fieldWidth_ / 2;
@@ -172,7 +172,7 @@
{
if (position.x > this->fieldWidth_ / 2 && this->bat_[1])
{
- distance = (position.z - this->bat_[1]->getPosition().z) / (this->fieldHeight_ * (this->batlength_ * 1.10) / 2);
+ distance = (position.z - this->bat_[1]->getPosition().z) / (this->fieldHeight_ * (this->batlength_ * 1.10f) / 2);
if (fabs(distance) <= 1)
{
position.x = this->fieldWidth_ / 2;
@@ -183,7 +183,7 @@
}
if (position.x < -this->fieldWidth_ / 2 && this->bat_[0])
{
- distance = (position.z - this->bat_[0]->getPosition().z) / (this->fieldHeight_ * (this->batlength_ * 1.10) / 2);
+ distance = (position.z - this->bat_[0]->getPosition().z) / (this->fieldHeight_ * (this->batlength_ * 1.10f) / 2);
if (fabs(distance) <= 1)
{
position.x = -this->fieldWidth_ / 2;
Modified: branches/pch/src/orxonox/objects/worldentities/WorldEntity.h
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/WorldEntity.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/worldentities/WorldEntity.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -33,13 +33,12 @@
#include "OrxonoxPrereqs.h"
#ifdef ORXONOX_RELEASE
-#include <OgreSceneNode.h>
-#else
-#include <OgrePrerequisites.h>
+# include <OgreSceneNode.h>
#endif
#include <LinearMath/btMotionState.h>
#include "util/Math.h"
+#include "util/OgreForwardRefs.h"
#include "core/BaseObject.h"
#include "network/synchronisable/Synchronisable.h"
Modified: branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.cc
===================================================================
--- branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/objects/worldentities/pawns/Spectator.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -58,7 +58,7 @@
if (GameMode::showsGraphics())
{
this->greetingFlare_ = new BillboardSet();
- this->greetingFlare_->setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(1.0, 1.0, 0.8), Vector3(0, 20, 0), 1);
+ this->greetingFlare_->setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(1.0f, 1.0f, 0.8f), Vector3(0, 20, 0), 1);
if (this->greetingFlare_->getBillboardSet())
this->attachOgreObject(this->greetingFlare_->getBillboardSet());
this->greetingFlare_->setVisible(false);
Modified: branches/pch/src/orxonox/overlays/OrxonoxOverlay.cc
===================================================================
--- branches/pch/src/orxonox/overlays/OrxonoxOverlay.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/overlays/OrxonoxOverlay.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -214,11 +214,11 @@
float angle = this->angle_.valueDegrees();
if (angle < 0.0)
angle = -angle;
- angle -= 180.0 * (int)(angle / 180.0);
+ angle -= 180.0f * (int)(angle / 180.0);
// take the reverse if angle is about 90 degrees
float tempAspect;
- if (angle > 89.0 && angle < 91.0)
+ if (angle > 89.0f && angle < 91.0f)
{
tempAspect = 1.0 / this->windowAspectRatio_;
rotState_ = Vertical;
@@ -230,14 +230,14 @@
}
else
{
- tempAspect = 1.0;
+ tempAspect = 1.0f;
rotState_ = Inbetween;
}
// note: this is only an approximation that is mostly valid when the
// magnitude of the width is about the magnitude of the height.
// Correctly we would have to take the square root of width*height
- this->sizeCorrection_.x = 2.0 / (tempAspect + 1.0);
+ this->sizeCorrection_.x = 2.0f / (tempAspect + 1.0f);
this->sizeCorrection_.y = tempAspect * this->sizeCorrection_.x;
}
else
Modified: branches/pch/src/orxonox/overlays/OrxonoxOverlay.h
===================================================================
--- branches/pch/src/orxonox/overlays/OrxonoxOverlay.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/overlays/OrxonoxOverlay.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -37,9 +37,9 @@
#include "OrxonoxPrereqs.h"
#include <string>
-#include <OgrePrerequisites.h>
#include "util/Math.h"
+#include "util/OgreForwardRefs.h"
#include "core/BaseObject.h"
#include "interfaces/WindowEventListener.h"
Modified: branches/pch/src/orxonox/overlays/OverlayGroup.h
===================================================================
--- branches/pch/src/orxonox/overlays/OverlayGroup.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/overlays/OverlayGroup.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -37,8 +37,8 @@
#include "OrxonoxPrereqs.h"
#include <set>
-#include <OgrePrerequisites.h>
#include "util/Math.h"
+#include "util/OgreForwardRefs.h"
#include "core/BaseObject.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/OverlayText.h
===================================================================
--- branches/pch/src/orxonox/overlays/OverlayText.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/overlays/OverlayText.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -33,6 +33,7 @@
#include <string>
#include "util/Math.h"
+#include "util/OgreForwardRefs.h"
#include "OrxonoxOverlay.h"
namespace orxonox
Modified: branches/pch/src/orxonox/overlays/console/InGameConsole.h
===================================================================
--- branches/pch/src/orxonox/overlays/console/InGameConsole.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/overlays/console/InGameConsole.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -33,6 +33,7 @@
#include "OrxonoxPrereqs.h"
#include <string>
+#include "util/OgreForwardRefs.h"
#include "core/Shell.h"
#include "interfaces/WindowEventListener.h"
Modified: branches/pch/src/orxonox/overlays/hud/HUDBar.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDBar.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/overlays/hud/HUDBar.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -77,7 +77,7 @@
this->textureUnitState_ = material->getTechnique(0)->getPass(0)->createTextureUnitState();
this->textureUnitState_->setTextureName("bar2.tga");
// use the default colour
- this->textureUnitState_->setColourOperationEx(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, ColourValue(0.2, 0.7, 0.2));
+ this->textureUnitState_->setColourOperationEx(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, ColourValue(0.2f, 0.7f, 0.2f));
this->bar_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
.createOverlayElement("Panel", "HUDBar_bar_" + getUniqueNumberString()));
Modified: branches/pch/src/orxonox/overlays/hud/HUDBar.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDBar.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/overlays/hud/HUDBar.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -35,9 +35,9 @@
#include <map>
#include <vector>
-#include <OgrePrerequisites.h>
#include "util/Math.h"
+#include "util/OgreForwardRefs.h"
#include "core/BaseObject.h"
#include "overlays/OrxonoxOverlay.h"
Modified: branches/pch/src/orxonox/overlays/hud/HUDNavigation.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDNavigation.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/overlays/hud/HUDNavigation.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include <OgrePrerequisites.h>
+#include "util/OgreForwardRefs.h"
#include "interfaces/Tickable.h"
#include "overlays/OrxonoxOverlay.h"
Modified: branches/pch/src/orxonox/overlays/hud/HUDRadar.h
===================================================================
--- branches/pch/src/orxonox/overlays/hud/HUDRadar.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/overlays/hud/HUDRadar.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -34,8 +34,8 @@
#include <map>
#include <vector>
-#include <OgrePrerequisites.h>
+#include "util/OgreForwardRefs.h"
#include "interfaces/RadarListener.h"
#include "interfaces/RadarViewable.h"
#include "overlays/OrxonoxOverlay.h"
Modified: branches/pch/src/orxonox/overlays/hud/UnderAttackHealthBar.cc
===================================================================
--- branches/pch/src/orxonox/overlays/hud/UnderAttackHealthBar.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/overlays/hud/UnderAttackHealthBar.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -46,7 +46,7 @@
this->text_ = new OverlayText(this);
this->text_->setFont("Monofur");
- this->text_->setTextSize(0.04);
+ this->text_->setTextSize(0.04f);
this->text_->setAlignmentString("center");
this->text_->setColour(ColourValue::White);
this->text_->setPickPoint(Vector2(0.5, 0));
Modified: branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc
===================================================================
--- branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/overlays/notifications/NotificationQueue.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -47,7 +47,7 @@
const std::string NotificationQueue::DEFAULT_FONT = "VeraMono";
const Vector2 NotificationQueue::DEFAULT_POSITION = Vector2(0.0,0.0);
- const float NotificationQueue::DEFAULT_FONT_SIZE = 0.025;
+ const float NotificationQueue::DEFAULT_FONT_SIZE = 0.025f;
/**
@brief
Modified: branches/pch/src/orxonox/overlays/stats/Stats.h
===================================================================
--- branches/pch/src/orxonox/overlays/stats/Stats.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/overlays/stats/Stats.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -31,6 +31,7 @@
#include "OrxonoxPrereqs.h"
+#include "util/OgreForwardRefs.h"
#include "interfaces/Tickable.h"
#include "overlays/OrxonoxOverlay.h"
Modified: branches/pch/src/orxonox/tools/BillboardSet.h
===================================================================
--- branches/pch/src/orxonox/tools/BillboardSet.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/tools/BillboardSet.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -30,10 +30,8 @@
#define _BillboardSet_H__
#include "OrxonoxPrereqs.h"
+#include "util/OgreForwardRefs.h"
-#include <OgrePrerequisites.h>
-#include "util/UtilPrereqs.h"
-
namespace orxonox
{
class _OrxonoxExport BillboardSet
Modified: branches/pch/src/orxonox/tools/Mesh.h
===================================================================
--- branches/pch/src/orxonox/tools/Mesh.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/tools/Mesh.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -30,9 +30,8 @@
#define _Mesh_H__
#include "OrxonoxPrereqs.h"
+#include "util/OgreForwardRefs.h"
-#include <OgrePrerequisites.h>
-
namespace orxonox
{
class _OrxonoxExport Mesh
Modified: branches/pch/src/orxonox/tools/ParticleInterface.h
===================================================================
--- branches/pch/src/orxonox/tools/ParticleInterface.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/tools/ParticleInterface.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -31,7 +31,7 @@
#include "OrxonoxPrereqs.h"
-#include <OgrePrerequisites.h>
+#include "util/OgreForwardRefs.h"
#include "interfaces/TimeFactorListener.h"
#define getAllEmitters() \
Modified: branches/pch/src/orxonox/tools/Shader.cc
===================================================================
--- branches/pch/src/orxonox/tools/Shader.cc 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/tools/Shader.cc 2009-06-18 08:00:15 UTC (rev 3192)
@@ -215,7 +215,7 @@
if (pointer->first)
return (*((float*)pointer->second));
else
- return (*((int*)pointer->second));
+ return static_cast<float>(*((int*)pointer->second));
}
else
return 0;
Modified: branches/pch/src/orxonox/tools/Shader.h
===================================================================
--- branches/pch/src/orxonox/tools/Shader.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/orxonox/tools/Shader.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -34,8 +34,8 @@
#include <map>
#include <string>
#include <vector>
-#include <OgrePrerequisites.h>
+#include "util/OgreForwardRefs.h"
#include "interfaces/Tickable.h"
namespace orxonox
Modified: branches/pch/src/util/Convert.h
===================================================================
--- branches/pch/src/util/Convert.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/util/Convert.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -308,13 +308,6 @@
return ConverterExplicit<FromType, ToType>::convert(output, input);
}
- // For compatibility reasons. The same, but with capital ConvertValue
- template<class FromType, class ToType>
- FORCEINLINE bool ConvertValue(ToType* output, const FromType& input)
- {
- return convertValue(output, input);
- }
-
// Calls convertValue and returns true if the conversion was successful.
// Otherwise the fallback is used.
/**
@@ -371,14 +364,14 @@
template <class FromType>
FORCEINLINE std::string convertToString(FromType value)
{
- return getConvertedValue<FromType, std::string>(value);
+ return getConvertedValue<FromType, std::string>(value);
}
// convert from string Shortcut
template <class ToType>
FORCEINLINE ToType convertFromString(std::string str)
{
- return getConvertedValue<std::string, ToType>(str);
+ return getConvertedValue<std::string, ToType>(str);
}
////////////////////////////////
Modified: branches/pch/src/util/Math.h
===================================================================
--- branches/pch/src/util/Math.h 2009-06-17 19:53:11 UTC (rev 3191)
+++ branches/pch/src/util/Math.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -228,7 +228,7 @@
*/
inline float rnd()
{
- return rand() / (RAND_MAX + 1.0);
+ return rand() / (RAND_MAX + 1.0f);
}
/**
@@ -255,7 +255,7 @@
*/
inline float rndsgn()
{
- return ((rand() & 0x2) - 1); // rand() & 0x2 is either 2 or 0
+ return static_cast<float>((rand() & 0x2) - 1); // rand() & 0x2 is either 2 or 0
}
_UtilExport unsigned long getUniqueNumber();
Added: branches/pch/src/util/OgreForwardRefs.h
===================================================================
--- branches/pch/src/util/OgreForwardRefs.h (rev 0)
+++ branches/pch/src/util/OgreForwardRefs.h 2009-06-18 08:00:15 UTC (rev 3192)
@@ -0,0 +1,227 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Reto Grieder
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _OgreForwardRefs_H__
+#define _OgreForwardRefs_H__
+
+#include "UtilPrereqs.h"
+
+namespace Ogre
+{
+ class Angle;
+ class Animation;
+ class AnimationState;
+ class AnimationStateSet;
+ class AnimationTrack;
+ class Archive;
+ class ArchiveFactory;
+ class ArchiveManager;
+ class AutoParamDataSource;
+ class AxisAlignedBox;
+ class AxisAlignedBoxSceneQuery;
+ class Billboard;
+ class BillboardChain;
+ class BillboardSet;
+ class Bone;
+ class Camera;
+ class Codec;
+ class ColourValue;
+ class ConfigDialog;
+ template <typename T> class Controller;
+ template <typename T> class ControllerFunction;
+ class ControllerManager;
+ template <typename T> class ControllerValue;
+ class Degree;
+ class DynLib;
+ class DynLibManager;
+ class EdgeData;
+ class EdgeListBuilder;
+ class Entity;
+ class ErrorDialog;
+ class ExternalTextureSourceManager;
+ class Factory;
+ class Font;
+ class FontPtr;
+ class FontManager;
+ struct FrameEvent;
+ class FrameListener;
+ class Frustum;
+ class GpuProgram;
+ class GpuProgramPtr;
+ class GpuProgramManager;
+ class GpuProgramUsage;
+ class HardwareIndexBuffer;
+ class HardwareOcclusionQuery;
+ class HardwareVertexBuffer;
+ class HardwarePixelBuffer;
+ class HardwarePixelBufferSharedPtr;
+ class HighLevelGpuProgram;
+ class HighLevelGpuProgramPtr;
+ class HighLevelGpuProgramManager;
+ class HighLevelGpuProgramFactory;
+ class IndexData;
+ class IntersectionSceneQuery;
+ class IntersectionSceneQueryListener;
+ class Image;
+ class KeyFrame;
+ class Light;
+ class Log;
+ class LogManager;
+ class ManualResourceLoader;
+ class ManualObject;
+ class Material;
+ class MaterialPtr;
+ class MaterialManager;
+ class MaterialScriptCompiler;
+ class Math;
+ class Matrix3;
+ class Matrix4;
+ class MemoryManager;
+ class Mesh;
+ class MeshPtr;
+ class MeshSerializer;
+ class MeshSerializerImpl;
+ class MeshManager;
+ class MovableObject;
+ class MovablePlane;
+ class Node;
+ class NodeAnimationTrack;
+ class NodeKeyFrame;
+ class NumericAnimationTrack;
+ class NumericKeyFrame;
+ class Overlay;
+ class OverlayContainer;
+ class OverlayElement;
+ class OverlayElementFactory;
+ class OverlayManager;
+ class Particle;
+ class ParticleAffector;
+ class ParticleAffectorFactory;
+ class ParticleEmitter;
+ class ParticleEmitterFactory;
+ class ParticleSystem;
+ class ParticleSystemManager;
+ class ParticleSystemRenderer;
+ class ParticleSystemRendererFactory;
+ class ParticleVisualData;
+ class Pass;
+ class PatchMesh;
+ class PixelBox;
+ class Plane;
+ class PlaneBoundedVolume;
+ class Plugin;
+ class Pose;
+ class ProgressiveMesh;
+ class Profile;
+ class Profiler;
+ class Quaternion;
+ class Radian;
+ class Ray;
+ class RaySceneQuery;
+ class RaySceneQueryListener;
+ class Renderable;
+ class RenderPriorityGroup;
+ class RenderQueue;
+ class RenderQueueGroup;
+ class RenderQueueInvocation;
+ class RenderQueueInvocationSequence;
+ class RenderQueueListener;
+ class RenderSystem;
+ class RenderSystemCapabilities;
+ class RenderTarget;
+ class RenderTargetListener;
+ class RenderTexture;
+ class MultiRenderTarget;
+ class RenderWindow;
+ class RenderOperation;
+ class Resource;
+ class ResourceBackgroundQueue;
+ class ResourceGroupManager;
+ class ResourceManager;
+ class RibbonTrail;
+ class Root;
+ class SceneManager;
+ class SceneManagerEnumerator;
+ class SceneNode;
+ class SceneQuery;
+ class SceneQueryListener;
+ class ScriptLoader;
+ class Serializer;
+ class ShadowCaster;
+ class ShadowRenderable;
+ class ShadowTextureManager;
+ class SimpleRenderable;
+ class SimpleSpline;
+ class Skeleton;
+ class SkeletonPtr;
+ class SkeletonInstance;
+ class SkeletonManager;
+ class Sphere;
+ class SphereSceneQuery;
+ class StaticGeometry;
+ class StringConverter;
+ class StringInterface;
+ class SubEntity;
+ class SubMesh;
+ class TagPoint;
+ class Technique;
+ class TempBlendedBufferInfo;
+ class ExternalTextureSource;
+ class TextureUnitState;
+ class Texture;
+ class TexturePtr;
+ class TextureFont;
+ class TextureManager;
+ class TransformKeyFrame;
+ class Timer;
+ class UserDefinedObject;
+ class Vector2;
+ class Vector3;
+ class Vector4;
+ class Viewport;
+ class VertexAnimationTrack;
+ class VertexBufferBinding;
+ class VertexData;
+ class VertexDeclaration;
+ class VertexMorphKeyFrame;
+ class WireBoundingBox;
+ class Compositor;
+ class CompositorManager;
+ class CompositorChain;
+ class CompositorInstance;
+ class CompositionTechnique;
+ class CompositionPass;
+ class CompositionTargetPass;
+
+ // Originally not in OgrePrerequisites.h
+ class BorderPanelOverlayElement;
+ class PanelOverlayElement;
+ class TextAreaOverlayElement;
+}
+
+#endif /* _OgreForwardRefs_H__ */
Property changes on: branches/pch/src/util/OgreForwardRefs.h
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list