[Orxonox-commit 5455] r10118 - code/branches/surfaceraceHS14/src/modules/dodgerace2
sriedel at orxonox.net
sriedel at orxonox.net
Wed Nov 12 15:58:59 CET 2014
Author: sriedel
Date: 2014-11-12 15:58:59 +0100 (Wed, 12 Nov 2014)
New Revision: 10118
Modified:
code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc
code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h
Log:
Working atm. including function after function.
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt 2014-11-12 13:27:50 UTC (rev 10117)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/CMakeLists.txt 2014-11-12 14:58:59 UTC (rev 10118)
@@ -1,8 +1,8 @@
SET_SOURCE_FILES(Dodgerace2_SRC_FILES
DodgeRace.cc
DodgeRaceCenterPoint.cc
+DodgeRaceShip.cc
DodgeRaceHUDinfo.cc
-DodgeRaceShip.cc
)
ORXONOX_ADD_LIBRARY(dodgerace2
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc 2014-11-12 13:27:50 UTC (rev 10117)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.cc 2014-11-12 14:58:59 UTC (rev 10118)
@@ -32,37 +32,20 @@
*/
#include "DodgeRace.h"
+#include "DodgeRaceShip.h" // Necessary for getPlayer function. Do NOT include this in Header!
-#include "core/CoreIncludes.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 "DodgeRaceCenterPoint.h"
-#include "DodgeRaceShip.h"
-#include "DodgeRaceEnemy.h"
-#include "DodgeRaceEnemyShooter.h"
-*/
-#include "core/command/ConsoleCommand.h"
-#include "worldentities/BigExplosion.h"
-
namespace orxonox
{
- RegisterClass(DodgeRace);
+ RegisterUnloadableClass(DodgeRace);
DodgeRace::DodgeRace(Context* context) : Deathmatch(context)
{
RegisterObject(DodgeRace);
- this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
- this->center_ = NULL;
init();
- this->setHUDTemplate("DodgeRaceHUD"); // !!!!!!!!!!!!!!! change later
+ this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
+ this->center_ = 0;
+ /*
+ this->setHUDTemplate("DodgeRaceHUD"); // !!!!!!!!!!!!!!! change later*/
}
void DodgeRace::init()
@@ -74,15 +57,16 @@
bShowLevel = false;
multiplier = 1;
b_combo = false;
+
// spawn enemy every 3.5 seconds
//enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&DodgeRace::spawnEnemy, this)));
- //comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&DodgeRace::comboControll, this)));
+ comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&DodgeRace::comboControll, this)));
}
void DodgeRace::levelUp()
{
level++;
- if (getPlayer() != NULL)
+ /* if (getPlayer() != NULL)
{
for (int i = 0; i < 7; i++)
{
@@ -91,7 +75,7 @@
chunk->setVelocity(Vector3(1000, 0, 0)); //player->getVelocity()
chunk->setScale(20);
}
- }
+ }*/
addPoints(multiplier * 42);
multiplier *= 2;
toggleShowLevel();
@@ -109,8 +93,8 @@
}
return player;
}
-
- /*void DodgeRace::spawnEnemy()
+/*
+ void DodgeRace::spawnEnemy()
{
if (getPlayer() == NULL)
return;
@@ -133,7 +117,7 @@
// spawn enemy at random points in front of player.
newPawn->setPosition(player->getPosition() + Vector3(500.f + 100 * i, 0, float(rand())/RAND_MAX * 400 - 200));
}
- }*/
+ }
void DodgeRace::costLife()
{
@@ -143,7 +127,7 @@
// if (lives <= 0)
// enemySpawnTimer.setTimer(30.0f, false, createExecutor(createFunctor(&DodgeRace::end, this)));
};
-
+*/
void DodgeRace::comboControll()
{
if (b_combo)
@@ -160,12 +144,12 @@
// Set variable to temporarily force the player to spawn.
this->bForceSpawn_ = true;
- if (this->center_ == NULL) // abandon mission!
+ /*if (this->center_ == NULL) // abandon mission!
{
orxout(internal_error) << "DodgeRace: No Centerpoint specified." << endl;
GSLevel::startMainMenu();
return;
- }
+ }*/
// Call start for the parent class.
Deathmatch::start();
}
@@ -177,7 +161,7 @@
b_combo = true;
}
}
-
+/*
void DodgeRace::end()
{
// DON'T CALL THIS!
@@ -185,5 +169,5 @@
// It will misteriously crash the game!
// Instead startMainMenu, this won't crash.
GSLevel::startMainMenu();
- }
+ }*/
}
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h 2014-11-12 13:27:50 UTC (rev 10117)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRace.h 2014-11-12 14:58:59 UTC (rev 10118)
@@ -37,59 +37,98 @@
#include "dodgerace2/DodgeRacePrereqs.h"
-//#include "DodgeRaceCenterPoint.h"
+#include "DodgeRaceCenterPoint.h" // Necessary for WeakPointer??
+//#include "DodgeRaceShip.h" // DO NOT include in Header. Will cause forward declaration issues
+
//#include "DodgeRaceHUDinfo.h"
-//#include "DodgeRaceShip.h"
+
+#include "core/CoreIncludes.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 "worldentities/BigExplosion.h"
+
#include "gametypes/Deathmatch.h"
#include "tools/Timer.h"
namespace orxonox
{
- class DodgeRace : public Deathmatch
+ class _DodgeRaceExport DodgeRace : public Deathmatch
{
- public:
+ public:
DodgeRace(Context* context);
+ void init();
+
virtual void start();
- virtual void end();
- virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+ //virtual void end();
- //void spawnEnemy();
+ void levelUp();
- void setCenterpoint(DodgeRaceCenterPoint* center)
- { this->center_ = center; }
-
int getLives(){return this->lives;}
int getLevel(){return this->level;}
int getPoints(){return this->point;}
int getMultiplier(){return this->multiplier;}
- void costLife();
- void levelUp();
- void addPoints(int numPoints);
+ void setCenterpoint(DodgeRaceCenterPoint* center)
+ { this->center_ = center; }
// checks if multiplier should be reset.
void comboControll();
- void init();
+
+ bool bEndGame;
+ bool bShowLevel;
int lives;
int multiplier;
- bool bEndGame;
- bool bShowLevel;
- private:
- void toggleShowLevel(){bShowLevel = !bShowLevel;}
+
+ private:
WeakPtr<DodgeRaceShip> getPlayer();
- WeakPtr<DodgeRaceCenterPoint> center_;
WeakPtr<DodgeRaceShip> player;
+ void toggleShowLevel(){bShowLevel = !bShowLevel;}
+ void addPoints(int numPoints);
- Timer enemySpawnTimer;
- Timer comboTimer;
- Timer showLevelTimer;
- //Context* context;
+ WeakPtr<DodgeRaceCenterPoint> center_;
int level;
int point;
bool b_combo;
+
+ Timer enemySpawnTimer;
+ Timer comboTimer;
+ Timer showLevelTimer;
+
+
+ /* virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
+
+ //void spawnEnemy();
+
+
+
+
+
+ void costLife();
+
+
+
+
+
+
+ private:
+
+
+
+
+ //Context* context;
+ */
};
}
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h 2014-11-12 13:27:50 UTC (rev 10117)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceCenterPoint.h 2014-11-12 14:58:59 UTC (rev 10118)
@@ -44,7 +44,7 @@
namespace orxonox
{
- class DodgeRaceCenterPoint : public StaticEntity
+ class _DodgeRaceExport DodgeRaceCenterPoint : public StaticEntity
{
public:
DodgeRaceCenterPoint(Context* context); //checks whether the gametype is actually DodgeRace.
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc 2014-11-12 13:27:50 UTC (rev 10117)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.cc 2014-11-12 14:58:59 UTC (rev 10118)
@@ -38,14 +38,14 @@
DodgeRaceHUDinfo::DodgeRaceHUDinfo(Context* context) : OverlayText(context)
{
RegisterObject(DodgeRaceHUDinfo);
-
+/*
this->DodgeRaceGame = 0;
this->bShowLives_ = false;
this->bShowLevel_ = false;
this->bShowPoints_ = false;
- this->bShowMultiplier_ = false;
+ this->bShowMultiplier_ = false;*/
}
-
+/*
void DodgeRaceHUDinfo::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(DodgeRaceHUDinfo, XMLPort, xmlelement, mode);
@@ -133,5 +133,5 @@
{
this->DodgeRaceGame = 0;
}
- }
+ }*/
}
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h 2014-11-12 13:27:50 UTC (rev 10117)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceHUDinfo.h 2014-11-12 14:58:59 UTC (rev 10118)
@@ -38,11 +38,11 @@
namespace orxonox
{
- class DodgeRaceHUDinfo : public OverlayText, public Tickable
+ class _DodgeRaceExport DodgeRaceHUDinfo : public OverlayText, public Tickable
{
- public:
+ public:
DodgeRaceHUDinfo(Context* context);
-
+ /*
virtual void tick(float dt);
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
virtual void changedOwner();
@@ -73,7 +73,7 @@
bool bShowLives_;
bool bShowLevel_;
bool bShowPoints_;
- bool bShowMultiplier_;
+ bool bShowMultiplier_;*/
};
}
#endif /* _DodgeRaceHUDinfo_H__ */
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h 2014-11-12 13:27:50 UTC (rev 10117)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRacePrereqs.h 2014-11-12 14:58:59 UTC (rev 10118)
@@ -74,7 +74,7 @@
//class DodgeRaceEnemyShooter;
//class DodgeRaceWeapon;
//class DodgeRaceWeaponEnemy;
- class DodgeRaceHUDinfo;
+ //class DodgeRaceHUDinfo;
}
#endif /* _DodgeRacePrereqs_H__*/
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc 2014-11-12 13:27:50 UTC (rev 10117)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.cc 2014-11-12 14:58:59 UTC (rev 10118)
@@ -33,10 +33,6 @@
#include "DodgeRaceShip.h"
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
-//#include "DodgeRace.h"
-
namespace orxonox
{
RegisterClass(DodgeRaceShip);
@@ -48,6 +44,10 @@
speed = 500;
isFireing = false;
damping = 10;
+
+ lastTimeFront = 0;
+ lastTimeLeft = 0;
+ lastTime = 0;
}
void DodgeRaceShip::tick(float dt)
@@ -105,14 +105,14 @@
setPosition(pos);
setOrientation(Vector3::UNIT_Y, Degree(270));
-
+/*
// Level up!
if (pos.x > 42000)
{
updateLevel();
setPosition(Vector3(0, 0, pos.z)); // pos - Vector3(30000, 0, 0)
}
-
+*/
SUPER(DodgeRaceShip, tick, dt);
}
@@ -138,7 +138,8 @@
{
isFireing = bBoost;
}
- /* inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+ /*
+ inline bool DodgeRaceShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
{
// orxout() << "touch!!! " << endl; //<< otherObject << " at " << contactPoint;
WeakPtr<DodgeRaceEnemy> enemy = orxonox_cast<DodgeRaceEnemy*>(otherObject);
@@ -168,21 +169,23 @@
}
return false;
// SUPER(DodgeRaceShip, collidesAgainst, otherObject, contactPoint);
- }*/
-
+ }
+*/
WeakPtr<DodgeRace> DodgeRaceShip::getGame()
{
if (game == NULL)
{
for (ObjectList<DodgeRace>::iterator it = ObjectList<DodgeRace>::begin(); it != ObjectList<DodgeRace>::end(); ++it)
- game = *it;
+ {
+ game = *it;
+ }
}
return game;
}
-
+/*
void DodgeRaceShip::death()
{
getGame()->costLife();
SpaceShip::death();
- }
+ }*/
}
Modified: code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h
===================================================================
--- code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h 2014-11-12 13:27:50 UTC (rev 10117)
+++ code/branches/surfaceraceHS14/src/modules/dodgerace2/DodgeRaceShip.h 2014-11-12 14:58:59 UTC (rev 10118)
@@ -37,15 +37,18 @@
#include "dodgerace2/DodgeRacePrereqs.h"
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
#include "worldentities/pawns/SpaceShip.h"
#include "graphics/Camera.h"
#include "weapons/projectiles/Projectile.h"
-//#include "DodgeRace.h"
+
+#include "DodgeRace.h" // Is necessary for getGame function
//#include "DodgeRaceCenterPoint.h"
namespace orxonox
{
- class DodgeRaceShip : public SpaceShip
+ class _DodgeRaceExport DodgeRaceShip : public SpaceShip
{
public:
DodgeRaceShip(Context* context);
@@ -53,40 +56,56 @@
virtual void tick(float dt);
// overwrite for 2d movement
- virtual void moveFrontBack(const Vector2& value);
- virtual void moveRightLeft(const Vector2& value);
+ virtual void moveFrontBack(const Vector2& value);
+ virtual void moveRightLeft(const Vector2& value);
- // Starts or stops fireing
- virtual void boost(bool bBoost);
+ // Starts or stops fireing
+ virtual void boost(bool bBoost);
- //no rotation!
- virtual void rotateYaw(const Vector2& value){};
- virtual void rotatePitch(const Vector2& value){};
- //return to main menu if game has ended.
- virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+ //no rotation!
+ virtual void rotateYaw(const Vector2& value){};
+ virtual void rotatePitch(const Vector2& value){};
- virtual void updateLevel();
+ //return to main menu if game has ended.
+ virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
- //virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+ virtual void updateLevel();
- protected:
- virtual void death();
+ float speed, damping, posforeward;
+ bool isFireing;
private:
WeakPtr<DodgeRace> getGame();
WeakPtr<DodgeRace> game;
Camera* camera;
- bool isFireing;
- float speed, damping, posforeward;
float lastTimeFront, lastTimeLeft, lastTime;
struct Velocity
{
- float x;
- float y;
+ float x;
+ float y;
} velocity, desiredVelocity;
+
+
+
+/*
+
+
+ //virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+
+ protected:
+ virtual void death();
+
+ private:
+
+
+
+
+
+
+
// WeakPtr<DodgeRaceEnemy> lastEnemy;
- WeakPtr<Projectile> lastShot;
+ WeakPtr<Projectile> lastShot;*/
};
}
More information about the Orxonox-commit
mailing list