[Orxonox-commit 6373] r11030 - in code/branches/presentationHS15/src: modules/hover orxonox/controllers orxonox/weaponsystem
landauf at orxonox.net
landauf at orxonox.net
Sun Jan 3 21:28:44 CET 2016
Author: landauf
Date: 2016-01-03 21:28:44 +0100 (Sun, 03 Jan 2016)
New Revision: 11030
Modified:
code/branches/presentationHS15/src/modules/hover/FlagHUD.cc
code/branches/presentationHS15/src/modules/hover/HoverFlag.cc
code/branches/presentationHS15/src/modules/hover/HoverWall.cc
code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc
code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc
code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.h
Log:
fixed some compiler warnings (MSVC)
Modified: code/branches/presentationHS15/src/modules/hover/FlagHUD.cc
===================================================================
--- code/branches/presentationHS15/src/modules/hover/FlagHUD.cc 2016-01-03 19:49:23 UTC (rev 11029)
+++ code/branches/presentationHS15/src/modules/hover/FlagHUD.cc 2016-01-03 20:28:44 UTC (rev 11030)
@@ -68,7 +68,7 @@
this->panel_->_getRelativeWidth() / ((float) flagCount_) * ((float) flagCount),
this->panel_->_getRelativeHeight()
);
- this->panel_->setTiling(flagCount, 1.0f);
+ this->panel_->setTiling(flagCount*1.0f, 1.0f);
this->flagCount_ = flagCount;
}
Modified: code/branches/presentationHS15/src/modules/hover/HoverFlag.cc
===================================================================
--- code/branches/presentationHS15/src/modules/hover/HoverFlag.cc 2016-01-03 19:49:23 UTC (rev 11029)
+++ code/branches/presentationHS15/src/modules/hover/HoverFlag.cc 2016-01-03 20:28:44 UTC (rev 11030)
@@ -73,7 +73,7 @@
model_ = new Model(context);
model_->setMeshSource("ss_flag_eu.mesh");
model_->setScale3D(Vector3(5, 5, 5));
- model_->setPosition(Vector3(xCoordinate*100 + 50,10,yCoordinate*100 + 50));
+ model_->setPosition(Vector3(xCoordinate*100.0f + 50.0f,10.0f,yCoordinate*100.0f + 50.0f));
this->attach(model_);
@@ -83,7 +83,7 @@
cs_ = new BoxCollisionShape(context);
cs_->setHalfExtents(Vector3(5, 5, 5));
- cs_->setPosition(Vector3(xCoordinate*100 + 50,0,yCoordinate*100 + 50));
+ cs_->setPosition(Vector3(xCoordinate*100.0f + 50.0f,0.0f,yCoordinate*100.0f + 50.0f));
this->attachCollisionShape(cs_);
this->collided_ = false;
Modified: code/branches/presentationHS15/src/modules/hover/HoverWall.cc
===================================================================
--- code/branches/presentationHS15/src/modules/hover/HoverWall.cc 2016-01-03 19:49:23 UTC (rev 11029)
+++ code/branches/presentationHS15/src/modules/hover/HoverWall.cc 2016-01-03 20:28:44 UTC (rev 11030)
@@ -86,8 +86,8 @@
model_ = new Model(context);
model_->setMeshSource("CuboidBody.mesh");
- model_->setScale3D(Vector3(xSize_, 30, zSize_));
- model_->setPosition(Vector3(xPos_,0,zPos_));
+ model_->setScale3D(Vector3(xSize_*1.0f, 30.0f, zSize_*1.0f));
+ model_->setPosition(Vector3(xPos_*1.0f, 0.0f, zPos_*1.0f));
this->attach(model_);
@@ -96,8 +96,8 @@
this->setCollisionType(Static);
cs_ = new BoxCollisionShape(context);
- cs_->setHalfExtents(Vector3(xSize_, 30, zSize_));
- cs_->setPosition(Vector3(xPos_,0,zPos_));
+ cs_->setHalfExtents(Vector3(xSize_*1.0f, 30.0f, zSize_*1.0f));
+ cs_->setPosition(Vector3(xPos_*1.0f, 0.0f, zPos_*1.0f));
this->attachCollisionShape(cs_);
}
Modified: code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc
===================================================================
--- code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc 2016-01-03 19:49:23 UTC (rev 11029)
+++ code/branches/presentationHS15/src/orxonox/controllers/SectionController.cc 2016-01-03 20:28:44 UTC (rev 11030)
@@ -191,18 +191,18 @@
switch (this->formationMode_){
case FormationMode::WALL:
{
- targetRelativePosition = new Vector3 (-2*this->spread_, 0, 0);
+ targetRelativePosition = new Vector3 (-2.0f*this->spread_, 0, 0);
break;
}
case FormationMode::FINGER4:
{
- targetRelativePosition = new Vector3 (-2*this->spread_, 0, this->spread_);
+ targetRelativePosition = new Vector3 (-2.0f*this->spread_, 0, 1.0f*this->spread_);
break;
}
case FormationMode::DIAMOND:
{
- targetRelativePosition = new Vector3 (-2*this->spread_, 0, this->spread_);
+ targetRelativePosition = new Vector3 (-2.0f*this->spread_, 0, 1.0f*this->spread_);
break;
}
}
Modified: code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc
===================================================================
--- code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc 2016-01-03 19:49:23 UTC (rev 11029)
+++ code/branches/presentationHS15/src/orxonox/controllers/WingmanController.cc 2016-01-03 20:28:44 UTC (rev 11030)
@@ -131,17 +131,17 @@
switch (this->formationMode_){
case FormationMode::WALL:
{
- targetRelativePosition = new Vector3 (2*this->spread_, 0, 0 - this->tolerance_);
+ targetRelativePosition = new Vector3 (2.0f*this->spread_, 0, 0 - 1.0f*this->tolerance_);
break;
}
case FormationMode::FINGER4:
{
- targetRelativePosition = new Vector3 (2*this->spread_, 0, this->spread_ - this->tolerance_);
+ targetRelativePosition = new Vector3 (2.0f*this->spread_, 0, this->spread_ - 1.0f*this->tolerance_);
break;
}
case FormationMode::DIAMOND:
{
- targetRelativePosition = new Vector3 (2*this->spread_, 0, this->spread_ - this->tolerance_);
+ targetRelativePosition = new Vector3 (2.0f*this->spread_, 0, this->spread_ - 1.0f*this->tolerance_);
break;
}
}
@@ -151,17 +151,17 @@
switch (this->formationMode_){
case FormationMode::WALL:
{
- targetRelativePosition = new Vector3 (-2*this->spread_, 0, 0 - this->tolerance_);
+ targetRelativePosition = new Vector3 (-2.0f*this->spread_, 0, 0 - 1.0f*this->tolerance_);
break;
}
case FormationMode::FINGER4:
{
- targetRelativePosition = new Vector3 (-2*this->spread_, 0, this->spread_ - this->tolerance_);
+ targetRelativePosition = new Vector3 (-2.0f*this->spread_, 0, this->spread_ - 1.0f*this->tolerance_);
break;
}
case FormationMode::DIAMOND:
{
- targetRelativePosition = new Vector3 (2*this->spread_, -this->spread_, 0 - this->tolerance_);
+ targetRelativePosition = new Vector3 (2.0f*this->spread_, -1.0f*this->spread_, 0 - 1.0f*this->tolerance_);
break;
}
}
Modified: code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.h
===================================================================
--- code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.h 2016-01-03 19:49:23 UTC (rev 11029)
+++ code/branches/presentationHS15/src/orxonox/weaponsystem/ReplenishingMunition.h 2016-01-03 20:28:44 UTC (rev 11030)
@@ -56,7 +56,7 @@
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
virtual float getProgress();
- inline float getReplenishAmount() const
+ inline unsigned int getReplenishAmount() const
{ return replenishAmount_; }
inline float getReplenishInterval() const
{ return replenishInterval_; }
More information about the Orxonox-commit
mailing list