[Orxonox-commit 7110] r11727 - code/branches/Presentation_HS17_merge/src/modules/asteroids2D
landauf at orxonox.net
landauf at orxonox.net
Sun Feb 11 15:44:50 CET 2018
Author: landauf
Date: 2018-02-11 15:44:49 +0100 (Sun, 11 Feb 2018)
New Revision: 11727
Modified:
code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc
code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h
code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h
code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc
code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h
code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h
code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc
code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h
code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc
code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h
Log:
[Asteroid_HS17] cleanup (mostly includes)
Modified: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc 2018-02-10 23:33:56 UTC (rev 11726)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.cc 2018-02-11 14:44:49 UTC (rev 11727)
@@ -53,8 +53,11 @@
#include "Asteroids2D.h"
#include "Asteroids2DShip.h" // Necessary for getPlayer function. Do NOT include this in Header!
#include "Asteroids2DStone.h"
+#include "Asteroids2DCenterPoint.h"
+#include "Asteroids2DHUDinfo.h"
#include "core/CoreIncludes.h"
#include "Highscore.h"
+#include "gamestates/GSLevel.h"
namespace orxonox
{
@@ -78,8 +81,11 @@
levelupTimer.setTimer(30.0f, true, createExecutor(createFunctor(&Asteroids2D::levelUp, this))); //level up every 30s
}
+ void Asteroids2D::setCenterpoint(Asteroids2DCenterPoint* center)
+ {
+ this->center_ = center;
+ }
-
void Asteroids2D::levelUp()
{
level++;
Modified: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h 2018-02-10 23:33:56 UTC (rev 11726)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2D.h 2018-02-11 14:44:49 UTC (rev 11727)
@@ -42,24 +42,6 @@
#include "asteroids2D/Asteroids2DPrereqs.h"
-#include "Asteroids2DCenterPoint.h" // Necessary for WeakPointer??
-//#include "Asteroids2DShip.h" DO NOT include in Header. Will cause forward declaration issues
-
-//#include "Asteroids2DHUDinfo.h"
-
-
-#include "core/EventIncludes.h"
-#include "core/command/Executor.h"
-#include "core/config/ConfigValueIncludes.h"
-
-#include "gamestates/GSLevel.h"
-#include "chat/ChatManager.h"
-
-// ! HACK
-#include "infos/PlayerInfo.h"
-
-#include "core/command/ConsoleCommand.h"
-
#include "gametypes/Deathmatch.h"
#include "tools/Timer.h"
@@ -90,8 +72,8 @@
//Generate Stones
void spawnStone();
- void setCenterpoint(Asteroids2DCenterPoint* center)
- { this->center_ = center; }
+ void setCenterpoint(Asteroids2DCenterPoint* center);
+
void addPoints(int numPoints);
virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
Modified: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h 2018-02-10 23:33:56 UTC (rev 11726)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DCenterPoint.h 2018-02-11 14:44:49 UTC (rev 11727)
@@ -37,9 +37,6 @@
#include "asteroids2D/Asteroids2DPrereqs.h"
-//#include "Asteroids2D.h"
-//#include "Asteroids2DHUDinfo.h"
-
#include "worldentities/StaticEntity.h"
namespace orxonox
Modified: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc 2018-02-10 23:33:56 UTC (rev 11726)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.cc 2018-02-11 14:44:49 UTC (rev 11727)
@@ -29,7 +29,7 @@
#include "core/CoreIncludes.h"
#include "core/XMLPort.h"
#include "util/Convert.h"
-//#include "Asteroids2D.h"
+#include "Asteroids2D.h"
namespace orxonox
{
Modified: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h 2018-02-10 23:33:56 UTC (rev 11726)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DHUDinfo.h 2018-02-11 14:44:49 UTC (rev 11727)
@@ -30,10 +30,6 @@
#ifndef _Asteroids2DHUDinfo_H__
#define _Asteroids2DHUDinfo_H__
-//#include "Asteroids2DShip.h"
-#include "Asteroids2D.h"
-//#include "Asteroids2DCenterPoint.h"
-
#include "asteroids2D/Asteroids2DPrereqs.h"
#include "tools/interfaces/Tickable.h"
@@ -58,8 +54,6 @@
private:
Asteroids2D* Asteroids2DGame;
- bool bShowLives_;
- bool bShowLevel_;
bool bShowPoints_;
Modified: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h 2018-02-10 23:33:56 UTC (rev 11726)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DPrereqs.h 2018-02-11 14:44:49 UTC (rev 11727)
@@ -69,13 +69,10 @@
{
class Asteroids2D;
class Asteroids2DCenterPoint;
+ class Asteroids2DHUDinfo;
class Asteroids2DShip;
- class Asteroids2DCube;
- //class Asteroids2DEnemy;
- //class Asteroids2DEnemyShooter;
- //class Asteroids2DWeapon;
- //class Asteroids2DWeaponEnemy;
- //class Asteroids2DHUDinfo;
+ class Asteroids2DStone;
+ class Asteroids2DWeapon;
}
#endif /* _Asteroids2DPrereqs_H__*/
Modified: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc 2018-02-10 23:33:56 UTC (rev 11726)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.cc 2018-02-11 14:44:49 UTC (rev 11727)
@@ -34,6 +34,7 @@
#include "Asteroids2DShip.h"
#include "Asteroids2DStone.h"
+#include "Asteroids2D.h"
#include "core/CoreIncludes.h"
namespace orxonox
@@ -44,7 +45,7 @@
{
RegisterObject(Asteroids2DShip);
- isFireing = false;
+ this->bImmune = false;
this->width = 1043;
this->height = 646;
@@ -90,7 +91,6 @@
void Asteroids2DShip::boost(bool bBoost)
{
- isFireing = bBoost;
}
void Asteroids2DShip::updateLevel()
Modified: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h 2018-02-10 23:33:56 UTC (rev 11726)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h 2018-02-11 14:44:49 UTC (rev 11727)
@@ -37,19 +37,9 @@
#include "asteroids2D/Asteroids2DPrereqs.h"
-
-#include "core/XMLPort.h"
#include "worldentities/pawns/SpaceShip.h"
-#include "weapons/WeaponsPrereqs.h"
-#include "graphics/Camera.h"
-
-#include "Asteroids2D.h" // Is necessary for getGame function
-//#include "Asteroids2DCenterPoint.h"
-#include "Asteroids2DStone.h"
-
#include "tools/Timer.h"
-
namespace orxonox
{
class _Asteroids2DExport Asteroids2DShip : public SpaceShip
@@ -66,8 +56,6 @@
virtual void updateLevel();
virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
-
- bool isFireing;
/*Functions that can be helpful while debugging.
- Set a timer so that the function is called for instance every 3s to display the coordinates
Modified: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc 2018-02-10 23:33:56 UTC (rev 11726)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc 2018-02-11 14:44:49 UTC (rev 11727)
@@ -34,21 +34,15 @@
#include "Asteroids2DWeapon.h"
#include "core/CoreIncludes.h"
-// #include "core/XMLPort.h"
-// #include "core/command/Executor.h"
#include "graphics/Model.h"
#include "weaponsystem/Weapon.h"
#include "weaponsystem/WeaponPack.h"
#include "weaponsystem/WeaponSystem.h"
-#include "worldentities/WorldEntity.h"
-#include "worldentities/pawns/Pawn.h"
#include "weapons/projectiles/Projectile.h"
#include "weapons/MuzzleFlash.h"
-#include "Asteroids2D.h"
-
namespace orxonox
{
RegisterClass(Asteroids2DWeapon);
@@ -65,19 +59,6 @@
}
- Asteroids2D* Asteroids2DWeapon::getGame()
- {
- if (game == nullptr)
- {
- for (Asteroids2D* race : ObjectList<Asteroids2D>())
- {
- game = race;
- }
- }
- return game;
- }
-
-
void Asteroids2DWeapon::shot()
{
assert( this->getWeapon() && this->getWeapon()->getWeaponPack() && this->getWeapon()->getWeaponPack()->getWeaponSystem() && this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn() );
Modified: code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h 2018-02-10 23:33:56 UTC (rev 11726)
+++ code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.h 2018-02-11 14:44:49 UTC (rev 11727)
@@ -39,8 +39,6 @@
#include "weapons/WeaponsPrereqs.h"
#include "weapons/weaponmodes/HsW01.h"
-#include "Asteroids2D.h"
-
namespace orxonox
{
class _Asteroids2DExport Asteroids2DWeapon : public HsW01
@@ -48,13 +46,10 @@
public:
Asteroids2DWeapon(Context* context);
virtual ~Asteroids2DWeapon();
- Asteroids2D* getGame();
-
protected:
virtual void shot() override; //2D movement
WeakPtr<Projectile> projectile;
- WeakPtr<Asteroids2D> game;
};
}
More information about the Orxonox-commit
mailing list