[Orxonox-commit 5659] r10319 - code/branches/towerdefenseFS15/src/modules/towerdefense
erbj at orxonox.net
erbj at orxonox.net
Thu Mar 19 13:31:54 CET 2015
Author: erbj
Date: 2015-03-19 13:31:54 +0100 (Thu, 19 Mar 2015)
New Revision: 10319
Removed:
code/branches/towerdefenseFS15/src/modules/towerdefense/Tower.cc
code/branches/towerdefenseFS15/src/modules/towerdefense/Tower.h
code/branches/towerdefenseFS15/src/modules/towerdefense/TowerTurret.cc
code/branches/towerdefenseFS15/src/modules/towerdefense/TowerTurret.h
Modified:
code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt
code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc
code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc
code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h
Log:
tower now inherits from turret
Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt 2015-03-15 16:27:57 UTC (rev 10318)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt 2015-03-19 12:31:54 UTC (rev 10319)
@@ -1,7 +1,6 @@
SET_SOURCE_FILES(TOWERDEFENSE_SRC_FILES
TowerDefense.cc
TowerDefenseTower.cc
- TowerTurret.cc
TowerDefenseCenterpoint.cc
TowerDefenseHUDController.cc
TowerDefensePlayerStats.cc
@@ -16,5 +15,6 @@
LINK_LIBRARIES
orxonox
overlays
+ objects
SOURCE_FILES ${TOWERDEFENSE_SRC_FILES}
)
Deleted: code/branches/towerdefenseFS15/src/modules/towerdefense/Tower.cc
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/Tower.cc 2015-03-15 16:27:57 UTC (rev 10318)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/Tower.cc 2015-03-19 12:31:54 UTC (rev 10319)
@@ -1,113 +0,0 @@
-//
-// Tower.cc
-// Orxonox
-//
-// Created by Fabian Mentzer on 29.04.12.
-// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-/* Not implemented fully */
-
-#include "Tower.h"
-
-#include "core/CoreIncludes.h"
-//#include "core/XMLPort.h"
-
-namespace orxonox
-{
- RegisterClass(Tower);
-
- /**
- @brief
- Constructor. Registers and initializes the object.
- */
- Tower::Tower(Context* context) : Pawn(context)
- {
- RegisterObject(Tower);
-
- this->setCollisionType(WorldEntity::Dynamic);
-
- //this->removeAllEngines();
-
- /*
- this->size_ = 10.0f;
- this->delay_ = false;
- this->delayTimer_.setTimer(0.2f, false, createExecutor(createFunctor(&TetrisStone::enableMovement, this)));
- */
- }
-
- void Tower::setOrientation(const Quaternion& orientation)
- {
- static int ori;
- //orxout() << "orientation " << ++ori << endl;
- }
-
- void Tower::rotateYaw(const Vector2& value)
- {
- static int yaw;
- //orxout() << "rotateYaw " << ++yaw << endl;
- }
-
- void Tower::rotatePitch(const Vector2& value)
- {
- static int pitch;
- //orxout() << "rotatePitch " << ++pitch << endl;
- }
-
- void Tower::rotateRoll(const Vector2& value)
- {
- static int roll;
- //orxout() << "rotateRoll" << ++roll << endl;
- }
-
- // This function is called whenever a player presses the up or the down key.
- // You have to implement what happens when the up or the down key is pressed.
- // value.x < 0 means: down key is pressed.
- // I suggest to create a new class which is a controllable entity I will refer to as "TowerMover". This is the controllable entity that the
- // player controls in order to move the tower along the centerpoint and in order to place the tower at the appropriate position.
- //
-
- // The tower itsself is controlled by a WayPointPatroController at the instance you place it on the centerpoint.
- //(don't forget to set the team_ parameter such that all tower are in the same team)
-
- //How to move a tower: simply attach the tower to the TowerMover
- //How to place a tower: detach the tower from the TowerMover
-
- /**
- @brief
- Overloaded the function to rotate the stone.
- @param value
- A vector whose first component is the angle by which to rotate.
- */
- /*
- void Tower::moveFrontBack(const Vector2& value)
- {
- //orxout() << "frontBack.x: " << value.x << endl;
- }
- */
-
- /**
- @brief
- Overloaded the function to steer the stone right and left
- @param value
- A vector whose first component is the direction in which we want to steer the stone.
- */
- /*
- void Tower::moveRightLeft(const Vector2& value)
- {
- //orxout() << "rightLeft.x: " << value.x << endl;
-
- if(!this->delay_)
- {
- const Vector3& position = this->getPosition();
- Vector3 newPos = Vector3(position.x+value.x/abs(value.x)*this->size_, position.y, position.z);
- if(!this->tetris_->isValidMove(this, newPos))
- return;
-
- this->setPosition(newPos);
- this->delay_ = true;
- this->delayTimer_.startTimer();
- }
- }
- */
-}
Deleted: code/branches/towerdefenseFS15/src/modules/towerdefense/Tower.h
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/Tower.h 2015-03-15 16:27:57 UTC (rev 10318)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/Tower.h 2015-03-19 12:31:54 UTC (rev 10319)
@@ -1,52 +0,0 @@
-//
-// Tower.h
-// Orxonox
-//
-// Created by Fabian Mentzer on 29.04.12.
-// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-/**
- at brief
-See TowerDefenseReadme.txt for Information.
-
- at ingroup TowerDefense
-*/
-
-
-#ifndef Orxonox_Tower_h
-#define Orxonox_Tower_h
-
-#include "towerdefense/TowerDefensePrereqs.h"
-#include "worldentities/pawns/SpaceShip.h"
-
-
-namespace orxonox
-{
- class _TowerDefenseExport Tower : public Pawn
- {
- public:
- Tower(Context* context);
- virtual ~Tower() {};
-
- // Maybe later override these to move towers with cursor keys
- /*
- virtual void moveFrontBack(const Vector2& value);
- virtual void moveRightLeft(const Vector2& value);
- */
-
- // Overriding these to stop towers from spasing out
- void setOrientation(const Quaternion& orientation);
- virtual void rotateYaw(const Vector2& value);
- virtual void rotatePitch(const Vector2& value);
- virtual void rotateRoll(const Vector2& value);
-
- void setGame(TowerDefense* towerdefense)
- { assert(towerdefense); game_ = towerdefense; }
- private:
- TowerDefense* game_;
- };
-}
-
-
-#endif
Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc 2015-03-15 16:27:57 UTC (rev 10318)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc 2015-03-19 12:31:54 UTC (rev 10319)
@@ -76,7 +76,6 @@
#include "TowerDefenseTower.h"
#include "TowerDefenseCenterpoint.h"
//#include "TDCoordinate.h"
-#include "TowerTurret.h"
#include "worldentities/SpawnPoint.h"
#include "worldentities/pawns/Pawn.h"
#include "worldentities/pawns/SpaceShip.h"
@@ -140,6 +139,7 @@
}
}
+ //the path of the spacehips has to be blocked, so that no towers can be build there
for (int k=0; k<3; k++)
towermatrix[1][k]=true;
for (int l=1; l<11; l++)
@@ -152,18 +152,17 @@
towermatrix[13][o]=true;
//set initial credits, lifes and WaveNumber
- this->setCredit(200);
+ this->setCredit(1000);
this->setLifes(50);
this->setWaveNumber(0);
time=0.0;
//adds initial towers
+ /*
for (int i=0; i <7; i++){
addTower(i+3,4);
- }/*
- for (int j=0; j < 7; j++){
- addTower(9,j+5);
- }*/
+ }
+ */
}
// Generates a TowerDefenseEnemy. Uses Template "enemytowerdefense". Sets position at first waypoint of path.
Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc 2015-03-15 16:27:57 UTC (rev 10318)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc 2015-03-19 12:31:54 UTC (rev 10319)
@@ -21,13 +21,16 @@
@brief
Constructor. Registers and initializes the object.
*/
- TowerDefenseTower::TowerDefenseTower(Context* context) : Pawn(context)
+ TowerDefenseTower::TowerDefenseTower(Context* context) : Turret(context)
{
RegisterObject(TowerDefenseTower);
-
+ game_ =NULL;
this->setCollisionType(WorldEntity::Dynamic);
upgrade = 0;
+
+
+
//this->removeAllEngines();
/*
Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h 2015-03-15 16:27:57 UTC (rev 10318)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h 2015-03-19 12:31:54 UTC (rev 10319)
@@ -19,11 +19,12 @@
#include "towerdefense/TowerDefensePrereqs.h"
#include "worldentities/pawns/SpaceShip.h"
+#include "objects/Turret.h"
namespace orxonox
{
- class _TowerDefenseExport TowerDefenseTower : public Pawn
+ class _TowerDefenseExport TowerDefenseTower : public Turret
{
public:
TowerDefenseTower(Context* context);
Deleted: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerTurret.cc
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerTurret.cc 2015-03-15 16:27:57 UTC (rev 10318)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerTurret.cc 2015-03-19 12:31:54 UTC (rev 10319)
@@ -1,41 +0,0 @@
-//
-// Tower.cc
-// Orxonox
-//
-// Created by Fabian Mentzer on 29.04.12.
-// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-/* Not implemented fully */
-
-//#include "Tower.h"
-#include "TowerTurret.h"
-
-#include "core/CoreIncludes.h"
-//#include "core/XMLPort.h"
-
-namespace orxonox
-{
- RegisterClass(TowerTurret);
-
- /**
- @brief
- Constructor. Registers and initializes the object.
- */
- TowerTurret::TowerTurret(Context* context) : StaticEntity(context)
- {
- RegisterObject(TowerTurret);
-
- this->setCollisionType(WorldEntity::Static);
-
-
- }
-
- void TowerTurret::setOrientation(const Quaternion& orientation)
- {
- static int ori;
- orxout() << "orientation " << ++ori << endl;
- }
-
-
-}
Deleted: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerTurret.h
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerTurret.h 2015-03-15 16:27:57 UTC (rev 10318)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerTurret.h 2015-03-19 12:31:54 UTC (rev 10319)
@@ -1,53 +0,0 @@
-//
-// Tower.h
-// Orxonox
-//
-// Created by Fabian Mentzer on 29.04.12.
-// Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-/**
- at brief
-See TowerDefenseReadme.txt for Information.
-
- at ingroup TowerDefense
-*/
-
-
-#ifndef Orxonox_Tower_h
-#define Orxonox_Tower_h
-
-#include "towerdefense/TowerDefensePrereqs.h"
-#include "worldentities/pawns/SpaceShip.h"
-#include "worldentities/StaticEntity.h"
-
-
-namespace orxonox
-{
- class _TowerDefenseExport TowerTurret : public StaticEntity
- {
- public:
- TowerTurret(Context* context);
- virtual ~TowerTurret() {};
-
- // Maybe later override these to move towers with cursor keys
- /*
- virtual void moveFrontBack(const Vector2& value);
- virtual void moveRightLeft(const Vector2& value);
- */
-
- // Overriding these to stop towers from spasing out
- void setOrientation(const Quaternion& orientation);
- //virtual void rotateYaw(const Vector2& value);
- //virtual void rotatePitch(const Vector2& value);
- //virtual void rotateRoll(const Vector2& value);
-
- void setGame(TowerDefense* towerdefense)
- { assert(towerdefense); game_ = towerdefense; }
- private:
- TowerDefense* game_;
- };
-}
-
-
-#endif
More information about the Orxonox-commit
mailing list