[Orxonox-commit 6069] r10727 - in code/trunk/src: libraries/tools modules/pong modules/towerdefense modules/weapons/projectiles orxonox
landauf at orxonox.net
landauf at orxonox.net
Sat Oct 31 11:06:38 CET 2015
Author: landauf
Date: 2015-10-31 11:06:37 +0100 (Sat, 31 Oct 2015)
New Revision: 10727
Modified:
code/trunk/src/libraries/tools/Shader.cc
code/trunk/src/libraries/tools/Shader.h
code/trunk/src/modules/pong/PongAI.cc
code/trunk/src/modules/towerdefense/TowerDefense.cc
code/trunk/src/modules/towerdefense/TowerDefenseTower.cc
code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc
code/trunk/src/orxonox/Scene.cc
Log:
fixed warnings with MSVC14
Modified: code/trunk/src/libraries/tools/Shader.cc
===================================================================
--- code/trunk/src/libraries/tools/Shader.cc 2015-10-30 22:52:18 UTC (rev 10726)
+++ code/trunk/src/libraries/tools/Shader.cc 2015-10-31 10:06:37 UTC (rev 10727)
@@ -160,7 +160,7 @@
/**
@brief Defines a new integer value for a given parameter. The parameter will be updated if the compositor is rendered the next time.
*/
- void Shader::setParameter(size_t technique, size_t pass, const std::string& parameter, int value)
+ void Shader::setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, int value)
{
ParameterContainer container = {technique, pass, parameter, value};
this->parameters_.push_back(container);
@@ -170,7 +170,7 @@
/**
@brief Defines a new float value for a given parameter. The parameter will be updated if the compositor is rendered the next time.
*/
- void Shader::setParameter(size_t technique, size_t pass, const std::string& parameter, float value)
+ void Shader::setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, float value)
{
ParameterContainer container = {technique, pass, parameter, value};
this->parameters_.push_back(container);
Modified: code/trunk/src/libraries/tools/Shader.h
===================================================================
--- code/trunk/src/libraries/tools/Shader.h 2015-10-30 22:52:18 UTC (rev 10726)
+++ code/trunk/src/libraries/tools/Shader.h 2015-10-31 10:06:37 UTC (rev 10727)
@@ -88,8 +88,8 @@
virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera);
- void setParameter(size_t technique, size_t pass, const std::string& parameter, float value);
- void setParameter(size_t technique, size_t pass, const std::string& parameter, int value);
+ void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, float value);
+ void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, int value);
virtual void notifyMaterialRender(Ogre::uint32 pass_id, Ogre::MaterialPtr& materialPtr);
@@ -109,8 +109,8 @@
/// Helper struct to store parameters for shader programs.
struct ParameterContainer
{
- size_t technique_; ///< The ID of the technique
- size_t pass_; ///< The ID of the pass
+ unsigned short technique_; ///< The ID of the technique
+ unsigned short pass_; ///< The ID of the pass
std::string parameter_; ///< The name of the parameter
MultiType value_; ///< The desired value of the parameter
Modified: code/trunk/src/modules/pong/PongAI.cc
===================================================================
--- code/trunk/src/modules/pong/PongAI.cc 2015-10-30 22:52:18 UTC (rev 10726)
+++ code/trunk/src/modules/pong/PongAI.cc 2015-10-31 10:06:37 UTC (rev 10727)
@@ -210,9 +210,9 @@
void PongAI::calculateRandomOffset()
{
// Calculate the exponent for the position-formula
- float exp = pow(10, 1 - 2*this->strength_); // strength: 0 -> exp = 10
- // strength: 0.5 -> exp = 1
- // strength: 1 -> exp = 0.1
+ float exp = pow(10.0f, 1.0f - 2.0f*this->strength_); // strength: 0 -> exp = 10
+ // strength: 0.5 -> exp = 1
+ // strength: 1 -> exp = 0.1
// Calculate the relative position where to hit the ball with the bat
float position = pow(rnd(), exp); // exp > 1 -> position is more likely a small number
Modified: code/trunk/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/trunk/src/modules/towerdefense/TowerDefense.cc 2015-10-30 22:52:18 UTC (rev 10726)
+++ code/trunk/src/modules/towerdefense/TowerDefense.cc 2015-10-31 10:06:37 UTC (rev 10727)
@@ -330,7 +330,7 @@
++ waveNumber_;
timeSinceLastSpawn_ = 0.0;
- timeUntilNextWave_ = waveNumber_+20;
+ timeUntilNextWave_ = waveNumber_+20.0f;
waveSize_ = waveNumber_+5;
}
Modified: code/trunk/src/modules/towerdefense/TowerDefenseTower.cc
===================================================================
--- code/trunk/src/modules/towerdefense/TowerDefenseTower.cc 2015-10-30 22:52:18 UTC (rev 10726)
+++ code/trunk/src/modules/towerdefense/TowerDefenseTower.cc 2015-10-31 10:06:37 UTC (rev 10727)
@@ -62,7 +62,7 @@
upgrade++;
float reloadrate = getReloadRate();
float reloadwaittime = getReloadWaitTime();
- this->setDamageMultiplier((upgrade+1)*2);
+ this->setDamageMultiplier((upgrade+1)*2.0f);
//this->setRotationThrust(2*this->getRotationThrust());
reloadrate = 0.5f*reloadrate;
reloadwaittime = 0.5f*reloadwaittime;
Modified: code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc
===================================================================
--- code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc 2015-10-30 22:52:18 UTC (rev 10726)
+++ code/trunk/src/modules/weapons/projectiles/SplitGunProjectile.cc 2015-10-31 10:06:37 UTC (rev 10727)
@@ -133,7 +133,7 @@
for (int i = 0; i < numberOfChilds_; ++i)
{
// Every child projectile should fly uniform in different directions -> Rotate the velocityOffset in every iteration
- velocityOffset = Quaternion(Degree(360/numberOfChilds_), velocityInitial.normalisedCopy()) * velocityOffset;
+ velocityOffset = Quaternion(Degree(360.0f/numberOfChilds_), velocityInitial.normalisedCopy()) * velocityOffset;
velocityOffset.normalise();
SplitGunProjectile* projectile = new SplitGunProjectile(this->getContext());
Modified: code/trunk/src/orxonox/Scene.cc
===================================================================
--- code/trunk/src/orxonox/Scene.cc 2015-10-30 22:52:18 UTC (rev 10726)
+++ code/trunk/src/orxonox/Scene.cc 2015-10-31 10:06:37 UTC (rev 10727)
@@ -87,7 +87,7 @@
}
// No physics yet, XMLPort will do that.
- const int defaultMaxWorldSize = 100000;
+ const float defaultMaxWorldSize = 100000.0f;
this->negativeWorldRange_ = Vector3::UNIT_SCALE * -defaultMaxWorldSize;
this->positiveWorldRange_ = Vector3::UNIT_SCALE * defaultMaxWorldSize;
this->gravity_ = Vector3::ZERO;
More information about the Orxonox-commit
mailing list