[Orxonox-commit 7152] r11769 - code/branches/Presentation_HS17_merge/src/modules/superorxobros
landauf at orxonox.net
landauf at orxonox.net
Sun Feb 18 17:23:30 CET 2018
Author: landauf
Date: 2018-02-18 17:23:29 +0100 (Sun, 18 Feb 2018)
New Revision: 11769
Modified:
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc
code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h
Log:
[SOBv2_HS17] removed unused variables, added some initializations
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.cc 2018-02-18 16:23:29 UTC (rev 11769)
@@ -59,7 +59,6 @@
SOB::SOB(Context* context) : Deathmatch(context)
{
RegisterObject(SOB);
- camera = nullptr;
this->center_ = nullptr;
figure_ = nullptr;
@@ -68,6 +67,7 @@
points_=0;
timeLeft_=400.0;
done_ = true;
+ newHighscore = false;
lvl_ = 1;
}
@@ -78,17 +78,8 @@
*/
SOB::~SOB()
{
- if (this->isInitialized())
- this->cleanup();
}
- void SOB::cleanup()
- {
- camera = nullptr;
- }
-
-
-
void SOB::start()
{
if (center_ != nullptr) // There needs to be a SOBCenterpoint, i.e. the area the game takes place.
@@ -112,23 +103,15 @@
// Call start for the parent class.
Gametype::start();
- if (figure_ != nullptr)
- {
- camera = figure_->getCamera();
- }
-
}
void SOB::end()
{
- cleanup();
GSLevel::startMainMenu();
Deathmatch::end();
}
void SOB::restart() {
- cleanup();
-
// HACK - only method I found to simply reload the level
Game::getInstance().popState();
Game::getInstance().popState();
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOB.h 2018-02-18 16:23:29 UTC (rev 11769)
@@ -110,9 +110,7 @@
protected:
- void cleanup(); //!< Cleans up the Gametype
WeakPtr<SOBFigure> figure_;
- WeakPtr<Camera> camera;
int points_;
int coins_;
float timeLeft_;
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.cc 2018-02-18 16:23:29 UTC (rev 11769)
@@ -48,6 +48,8 @@
RegisterObject(SOBCoin);
setAngularFactor(0.0);
+ speed_ = 0;
+ lifetime_ = 0;
}
@@ -66,7 +68,7 @@
lifetime_-=dt;
- if (lifetime_ <+ 0) {
+ if (lifetime_ < 0) {
destroyLater();
}
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBCoin.h 2018-02-18 16:23:29 UTC (rev 11769)
@@ -49,8 +49,6 @@
virtual void tick(float dt) override;
- bool attachedToFigure_;
-
void setLifetime(const float lt)
{ this->lifetime_ = lt; }
float getLifetime() const
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.cc 2018-02-18 16:23:29 UTC (rev 11769)
@@ -68,7 +68,7 @@
moveUpPressed_ = false;
moveDownPressed_ = false;
moveLeftPressed_ = false;
- moveDownPressed_ = false;
+ moveRightPressed_ = false;
firePressed_ = false;
collDisZ_ = 0;
@@ -75,7 +75,6 @@
//Times and turning
timeSinceLastFire_ = 0.0;
lastSpeed_z = 0.0;
- pitch_ = 0.0;
timeCounter_ = 0;
//Properties of player
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFigure.h 2018-02-18 16:23:29 UTC (rev 11769)
@@ -67,8 +67,6 @@
float timeSinceLastFire_;
float lastSpeed_z;
float firecooldown_;
- SOBCenterpoint* sobcenterpoint;
- float pitch_;
bool isColliding_;
WorldEntity* particlespawner_;
int PowerUpCounter_;
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.cc 2018-02-18 16:23:29 UTC (rev 11769)
@@ -55,21 +55,15 @@
{
RegisterObject(SOBFireball);
- attachedToFigure_ = false;
setAngularFactor(0.0);
- figure_ = nullptr;
this->enableCollisionCallback();
gravityAcceleration_ = 350.0;
speed_ = 0;
hasCollided_=false;
- lastPos_ = getPosition();
- lastPos_.x -= 20;
changeAllowed_ = true;
changedOn_ = 0.0;
goesRight_ = true;
- collDisX_ = 0;
- collDisZ_ = 0;
hitCounter_ = 0;
particlespawner_ = NULL ;
@@ -103,8 +97,8 @@
bool SOBFireball::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) {
- collDisX_ = getPosition().x - contactPoint.getPositionWorldOnB().getX();
- collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ();
+ float collDisX_ = getPosition().x - contactPoint.getPositionWorldOnB().getX();
+ float collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ();
SOBGumba* gumba = orxonox_cast<SOBGumba*> (otherObject);
SOBGumbaBoss* gumbaBoss = orxonox_cast<SOBGumbaBoss*> (otherObject);
@@ -147,20 +141,10 @@
hitCounter_++;
- collDisZ_=0;
- collDisX_=0;
-
return true;
}
- void SOBFireball::setFigure(SOBFigure* newFigure)
- {
- figure_ = newFigure;
- }
-
-
-
void SOBFireball::tick(float dt)
{
SUPER(SOBFireball, tick, dt);
@@ -198,8 +182,6 @@
if(hitCounter_ >= 3) velocity.y = 0.1*speed_;
setVelocity(velocity);
- lastPos_ = getPosition();
-
if(abs(this->getPosition().z) > 1000) delete this;
}
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFireball.h 2018-02-18 16:23:29 UTC (rev 11769)
@@ -49,13 +49,10 @@
virtual ~SOBFireball() {}
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void setFigure(SOBFigure* newFigure);
virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
virtual void tick(float dt) override;
void setDirection(const bool direction);
- bool attachedToFigure_;
-
void setSpeed(const float speed)
{ this->speed_ = speed; }
float getSpeed() const
@@ -65,19 +62,11 @@
protected:
float gravityAcceleration_;
float speed_;
- WeakPtr<SOBFigure> figure_;
- Vector3 lastPos_;
bool goesRight_;
bool changeAllowed_;
float changedOn_;
int hitCounter_;
WorldEntity* particlespawner_;
-
-
-
-
- float collDisX_;
- float collDisZ_;
};
}
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBFlagstone.cc 2018-02-18 16:23:29 UTC (rev 11769)
@@ -51,8 +51,8 @@
this->enableCollisionCallback();
hasCollided_=false;
+ points_=0;
-
}
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc 2018-02-18 16:23:29 UTC (rev 11769)
@@ -47,16 +47,12 @@
{
RegisterObject(SOBGumba);
- attachedToFigure_ = false;
setAngularFactor(0.0);
- figure_ = nullptr;
this->enableCollisionCallback();
gravityAcceleration_ = 350.0;
speed_ = 0.0;
hasCollided_=false;
goesRight_ = true;
- lastPos_ = getPosition();
- lastPos_.x -= 20;
changeAllowed_ = true;
changedOn_ = 0.0;
creator_ = nullptr;
@@ -88,11 +84,6 @@
}
- void SOBGumba::setFigure(SOBFigure* newFigure)
- {
- figure_ = newFigure;
- }
-
void SOBGumba::setDirection(const bool direction)
{
if(direction)
@@ -139,8 +130,6 @@
velocity.z -= gravityAcceleration_*dt;
setVelocity(velocity);
- lastPos_ = getPosition();
-
if (creator_ != nullptr)
{
lifetime_ += dt;
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.h 2018-02-18 16:23:29 UTC (rev 11769)
@@ -46,7 +46,6 @@
public:
SOBGumba(Context* context);
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void setFigure(SOBFigure* newFigure);
virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
virtual void tick(float dt) override;
@@ -53,8 +52,6 @@
void setDirection(const bool direction);
void die();
- bool attachedToFigure_;
-
void setSpeed(const float speed)
{ this->speed_ = speed; }
float getSpeed() const
@@ -65,9 +62,7 @@
protected:
float gravityAcceleration_;
float speed_;
- WeakPtr<SOBFigure> figure_;
bool goesRight_;
- Vector3 lastPos_;
bool changeAllowed_;
float changedOn_;
float maxLifetime_;
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumbaBoss.cc 2018-02-18 16:23:29 UTC (rev 11769)
@@ -151,8 +151,6 @@
velocity.x = dir*speed_;
setVelocity(velocity);
- lastPos_ = getPosition();
-
}
// spawn gumbas
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.cc 2018-02-18 16:23:29 UTC (rev 11769)
@@ -47,16 +47,12 @@
{
RegisterObject(SOBMushroom);
- attachedToFigure_ = false;
setAngularFactor(0.0);
- figure_ = nullptr;
this->enableCollisionCallback();
gravityAcceleration_ = 350.0;
speed_ = 0.0;
hasCollided_=false;
goesRight_ = true;
- lastPos_ = getPosition();
- lastPos_.x -= 20;
changeAllowed_ = true;
changedOn_ = 0.0;
@@ -85,13 +81,6 @@
}
- void SOBMushroom::setFigure(SOBFigure* newFigure)
- {
- figure_ = newFigure;
- }
-
-
-
void SOBMushroom::tick(float dt)
{
SUPER(SOBMushroom, tick, dt);
@@ -103,8 +92,8 @@
changeAllowed_ = true;
changedOn_ = 0.0;
+ }
}
- }
int dir = 1;
@@ -115,11 +104,7 @@
velocity.z -= gravityAcceleration_*dt;
velocity.x = dir*speed_;
setVelocity(velocity);
+ }
-
- lastPos_ = getPosition();
- }
-
-
}
Modified: code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h
===================================================================
--- code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h 2018-02-18 15:27:43 UTC (rev 11768)
+++ code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBMushroom.h 2018-02-18 16:23:29 UTC (rev 11769)
@@ -46,13 +46,10 @@
public:
SOBMushroom(Context* context);
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
- virtual void setFigure(SOBFigure* newFigure);
virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
virtual void tick(float dt) override;
- bool attachedToFigure_;
-
void setSpeed(const float speed)
{ this->speed_ = speed; }
float getSpeed() const
@@ -62,9 +59,7 @@
protected:
float gravityAcceleration_;
float speed_;
- WeakPtr<SOBFigure> figure_;
bool goesRight_;
- Vector3 lastPos_;
bool changeAllowed_;
float changedOn_;
More information about the Orxonox-commit
mailing list