[Orxonox-commit 6160] r10818 - in code/branches/cpp11_v2/src: external/tolua/lua libraries/core/config libraries/util modules/dodgerace modules/invader modules/objects/controllers modules/towerdefense orxonox orxonox/chat orxonox/gamestates orxonox/worldentities orxonox/worldentities/pawns
muemart at orxonox.net
muemart at orxonox.net
Thu Nov 19 19:55:12 CET 2015
Author: muemart
Date: 2015-11-19 19:55:11 +0100 (Thu, 19 Nov 2015)
New Revision: 10818
Modified:
code/branches/cpp11_v2/src/external/tolua/lua/package.lua
code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h
code/branches/cpp11_v2/src/libraries/util/Math.h
code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.cc
code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h
code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc
code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h
code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc
code/branches/cpp11_v2/src/modules/invader/InvaderShip.h
code/branches/cpp11_v2/src/modules/objects/controllers/TeamTargetProxy.cc
code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc
code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc
code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h
code/branches/cpp11_v2/src/orxonox/Level.cc
code/branches/cpp11_v2/src/orxonox/Level.h
code/branches/cpp11_v2/src/orxonox/Scene.h
code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.cc
code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc
code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.cc
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h
Log:
- Fixed some suspicious virtual function signatures
- Fixed some clang warnings (and errors in the last commit, forgot to mention that)
- Fix compilation without pch
- Hack "override" keyword support into Tolua++
Modified: code/branches/cpp11_v2/src/external/tolua/lua/package.lua
===================================================================
--- code/branches/cpp11_v2/src/external/tolua/lua/package.lua 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/external/tolua/lua/package.lua 2015-11-19 18:55:11 UTC (rev 10818)
@@ -81,6 +81,7 @@
self.code = gsub(self.code,"\2","%*/")
self.code = gsub(self.code,"%s*@%s*","@") -- eliminate spaces beside @
self.code = gsub(self.code,"%s?inline(%s)","%1") -- eliminate 'inline' keyword
+ self.code = gsub(self.code,"%)%s?override;",");") -- eliminate 'override' keyword... at least most of the times
--self.code = gsub(self.code,"%s?extern(%s)","%1") -- eliminate 'extern' keyword
--self.code = gsub(self.code,"%s?virtual(%s)","%1") -- eliminate 'virtual' keyword
--self.code = gsub(self.code,"public:","") -- eliminate 'public:' keyword
Modified: code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.h 2015-11-19 18:55:11 UTC (rev 10818)
@@ -67,7 +67,7 @@
SettingsConfigFile(const std::string& filename);
~SettingsConfigFile();
- void load(); // tolua_export
+ void load() override; // tolua_export
void setFilename(const std::string& filename); // tolua_export
void clean(bool bCleanComments = false); // tolua_export
Modified: code/branches/cpp11_v2/src/libraries/util/Math.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/Math.h 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/libraries/util/Math.h 2015-11-19 18:55:11 UTC (rev 10818)
@@ -181,7 +181,7 @@
inline T zeroise()
{
// Default, raise a compiler error without including large boost header cascade.
- T temp();
+ T temp{};
*********temp; // If you reach this code, you abused zeroise()!
return temp;
}
Modified: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.cc 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.cc 2015-11-19 18:55:11 UTC (rev 10818)
@@ -141,7 +141,7 @@
//getGame()->bEndGame = bBoost;
}
- inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+ inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
{
removeHealth(100);
Modified: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h 2015-11-19 18:55:11 UTC (rev 10818)
@@ -69,6 +69,8 @@
virtual void updateLevel();
+ virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
+
float speed, damping, posforeward;
bool isFireing;
@@ -76,7 +78,6 @@
virtual void death() override;
private:
- virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
DodgeRace* getGame();
WeakPtr<DodgeRace> game;
WeakPtr<WorldEntity> lastEntity;
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.cc 2015-11-19 18:55:11 UTC (rev 10818)
@@ -63,7 +63,7 @@
SUPER(InvaderEnemy, tick, dt);
}
- inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+ inline bool InvaderEnemy::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
{
if(orxonox_cast<InvaderShip*>(otherObject))
removeHealth(2000);
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h 2015-11-19 18:55:11 UTC (rev 10818)
@@ -46,7 +46,7 @@
InvaderEnemy(Context* context);
virtual void tick(float dt) override;
- virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
virtual void setPlayer(InvaderShip* player){this->player = player;}
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc 2015-11-19 18:55:11 UTC (rev 10818)
@@ -147,7 +147,7 @@
if (getGame()->bEndGame)
getGame()->end();
}
- inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+ inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
{
// orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
InvaderEnemy* enemy = orxonox_cast<InvaderEnemy*>(otherObject);
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderShip.h
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderShip.h 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderShip.h 2015-11-19 18:55:11 UTC (rev 10818)
@@ -63,7 +63,7 @@
virtual void updateLevel();
- virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+ virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
protected:
virtual void death() override;
Modified: code/branches/cpp11_v2/src/modules/objects/controllers/TeamTargetProxy.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/controllers/TeamTargetProxy.cc 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/modules/objects/controllers/TeamTargetProxy.cc 2015-11-19 18:55:11 UTC (rev 10818)
@@ -27,6 +27,7 @@
*/
#include "TeamTargetProxy.h"
+#include "core/CoreIncludes.h"
#include "worldentities/ControllableEntity.h"
#include "worldentities/pawns/Pawn.h"
Modified: code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc 2015-11-19 18:55:11 UTC (rev 10818)
@@ -29,6 +29,8 @@
#include "TurretController.h"
#include "worldentities/pawns/Pawn.h"
#include "objects/Turret.h"
+#include "core/object/ObjectList.h"
+#include "core/CoreIncludes.h"
namespace orxonox
{
Modified: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.cc 2015-11-19 18:55:11 UTC (rev 10818)
@@ -54,7 +54,7 @@
return game;
}
- void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
+ void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
{
Pawn::damage(damage, healthdamage, shielddamage, originator);
Modified: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h 2015-11-19 18:55:11 UTC (rev 10818)
@@ -37,7 +37,7 @@
//health gibt es unter: health_
virtual void tick(float dt) override;
- virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
+ virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
private:
WeakPtr<TowerDefense> getGame();
Modified: code/branches/cpp11_v2/src/orxonox/Level.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Level.cc 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/orxonox/Level.cc 2015-11-19 18:55:11 UTC (rev 10818)
@@ -29,6 +29,7 @@
#include "Level.h"
#include "util/Math.h"
+#include "util/SubString.h"
#include "core/CoreIncludes.h"
#include "core/Loader.h"
#include "core/Template.h"
Modified: code/branches/cpp11_v2/src/orxonox/Level.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Level.h 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/orxonox/Level.h 2015-11-19 18:55:11 UTC (rev 10818)
@@ -36,6 +36,7 @@
#include <map>
#include "core/BaseObject.h"
#include "network/synchronisable/Synchronisable.h"
+#include "core/object/Context.h"
#include "graphics/MeshLodInformation.h"
namespace orxonox
Modified: code/branches/cpp11_v2/src/orxonox/Scene.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Scene.h 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/orxonox/Scene.h 2015-11-19 18:55:11 UTC (rev 10818)
@@ -39,6 +39,7 @@
#include "util/Math.h"
#include "util/OgreForwardRefs.h"
#include "core/BaseObject.h"
+#include "core/object/Context.h"
#include "network/synchronisable/Synchronisable.h"
#include "tools/interfaces/Tickable.h"
Modified: code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.cc 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.cc 2015-11-19 18:55:11 UTC (rev 10818)
@@ -29,6 +29,7 @@
#include "ChatHistory.h"
#include "core/singleton/ScopedSingletonIncludes.h"
#include "core/ConfigurablePaths.h"
+#include "core/CoreIncludes.h"
#ifndef CHATTEST
namespace orxonox
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc 2015-11-19 18:55:11 UTC (rev 10818)
@@ -33,6 +33,7 @@
#include "core/Game.h"
#include "core/GameMode.h"
#include "core/command/ConsoleCommandIncludes.h"
+#include "core/object/ObjectList.h"
#include "network/NetworkFunctionIncludes.h"
#include "tools/Timer.h"
#include "tools/interfaces/Tickable.h"
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc 2015-11-19 18:55:11 UTC (rev 10818)
@@ -29,6 +29,7 @@
#include "Drone.h"
#include "core/XMLPort.h"
+#include "core/CoreIncludes.h"
#include "BulletDynamics/Dynamics/btRigidBody.h"
namespace orxonox
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.cc 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.cc 2015-11-19 18:55:11 UTC (rev 10818)
@@ -281,7 +281,7 @@
}
}
- bool FpsPlayer::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+ bool FpsPlayer::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
{
if (contactPoint.m_normalWorldOnB.y() > 0.6)
this->isFloor_ = true;
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h 2015-11-19 10:40:28 UTC (rev 10817)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/pawns/FpsPlayer.h 2015-11-19 18:55:11 UTC (rev 10818)
@@ -68,7 +68,7 @@
virtual void fire();
- bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+ bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
virtual void addedWeaponPack(WeaponPack* wPack);
More information about the Orxonox-commit
mailing list