[Orxonox-commit 6368] r11025 - in code/branches/presentationHS15/src: modules/hover modules/objects modules/towerdefense orxonox/controllers orxonox/worldentities
landauf at orxonox.net
landauf at orxonox.net
Sun Jan 3 14:39:21 CET 2016
Author: landauf
Date: 2016-01-03 14:39:10 +0100 (Sun, 03 Jan 2016)
New Revision: 11025
Modified:
code/branches/presentationHS15/src/modules/hover/CMakeLists.txt
code/branches/presentationHS15/src/modules/hover/FlagHUD.h
code/branches/presentationHS15/src/modules/hover/HoverShip.h
code/branches/presentationHS15/src/modules/objects/Turret.h
code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseSelecter.cc
code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h
code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc
code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc
code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.h
Log:
tabs -> spaces
Modified: code/branches/presentationHS15/src/modules/hover/CMakeLists.txt
===================================================================
--- code/branches/presentationHS15/src/modules/hover/CMakeLists.txt 2016-01-02 22:49:25 UTC (rev 11024)
+++ code/branches/presentationHS15/src/modules/hover/CMakeLists.txt 2016-01-03 13:39:10 UTC (rev 11025)
@@ -12,7 +12,7 @@
PLUGIN
FIND_HEADER_FILES
LINK_LIBRARIES
- objects
+ objects
orxonox
overlays
SOURCE_FILES ${Hover_SRC_FILES}
Modified: code/branches/presentationHS15/src/modules/hover/FlagHUD.h
===================================================================
--- code/branches/presentationHS15/src/modules/hover/FlagHUD.h 2016-01-02 22:49:25 UTC (rev 11024)
+++ code/branches/presentationHS15/src/modules/hover/FlagHUD.h 2016-01-03 13:39:10 UTC (rev 11025)
@@ -48,7 +48,7 @@
FlagHUD(Context* context);
virtual ~FlagHUD();
- virtual void tick(float dt);
+ virtual void tick(float dt);
virtual void changedOwner();
virtual void setFlagCount(int flagCount);
Modified: code/branches/presentationHS15/src/modules/hover/HoverShip.h
===================================================================
--- code/branches/presentationHS15/src/modules/hover/HoverShip.h 2016-01-02 22:49:25 UTC (rev 11024)
+++ code/branches/presentationHS15/src/modules/hover/HoverShip.h 2016-01-03 13:39:10 UTC (rev 11025)
@@ -46,8 +46,8 @@
class _HoverExport HoverShip : public SpaceShip
{
private:
- float jumpBoost_;
- bool isFloor_;
+ float jumpBoost_;
+ bool isFloor_;
public:
HoverShip(Context* context);
@@ -58,25 +58,25 @@
virtual void setJumpBoost(float jumpBoost);
- virtual float getJumpBoost();
+ virtual float getJumpBoost();
- virtual void moveFrontBack(const Vector2& value);
+ virtual void moveFrontBack(const Vector2& value);
- virtual void moveRightLeft(const Vector2& value);
+ virtual void moveRightLeft(const Vector2& value);
- virtual void moveUpDown(const Vector2& value);
+ virtual void moveUpDown(const Vector2& value);
- virtual void rotateYaw(const Vector2& value);
+ virtual void rotateYaw(const Vector2& value);
- virtual void rotatePitch(const Vector2& value);
-
- virtual void rotateRoll(const Vector2& value);
+ virtual void rotatePitch(const Vector2& value);
- virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+ virtual void rotateRoll(const Vector2& value);
- virtual void boost(bool bBoost);
+ virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
- };
+ virtual void boost(bool bBoost);
+
+ };
}
#endif /* _HoverShip_H__ */
Modified: code/branches/presentationHS15/src/modules/objects/Turret.h
===================================================================
--- code/branches/presentationHS15/src/modules/objects/Turret.h 2016-01-02 22:49:25 UTC (rev 11024)
+++ code/branches/presentationHS15/src/modules/objects/Turret.h 2016-01-03 13:39:10 UTC (rev 11025)
@@ -102,10 +102,10 @@
{ return this->maxYaw_; }
inline void setRotationThrust(float rotationthrust)
- { this->rotationThrust_ = rotationthrust; }
+ { this->rotationThrust_ = rotationthrust; }
inline float getRotationThrust()
- { return this->rotationThrust_; }
+ { return this->rotationThrust_; }
protected:
Vector3 startDir_; //!< The initial facing direction, in local coordinates.
Modified: code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseSelecter.cc
===================================================================
--- code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseSelecter.cc 2016-01-02 22:49:25 UTC (rev 11024)
+++ code/branches/presentationHS15/src/modules/towerdefense/TowerDefenseSelecter.cc 2016-01-03 13:39:10 UTC (rev 11025)
@@ -87,7 +87,7 @@
if (moveDownPressed_ == true)
{
moveDownPressed_ = false;
- selectedPos_->Set(selecterPosX, selecterPosY - 1);
+ selectedPos_->Set(selecterPosX, selecterPosY - 1);
updatePosition();
}
if (moveLeftPressed_ == true)
@@ -99,7 +99,7 @@
if (moveRightPressed_ == true)
{
moveRightPressed_ = false;
- selectedPos_->Set(selecterPosX + 1, selecterPosY);
+ selectedPos_->Set(selecterPosX + 1, selecterPosY);
updatePosition();
}
if (boostPressed_ == true)
Modified: code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h
===================================================================
--- code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h 2016-01-02 22:49:25 UTC (rev 11024)
+++ code/branches/presentationHS15/src/orxonox/controllers/DivisionController.h 2016-01-03 13:39:10 UTC (rev 11025)
@@ -44,9 +44,9 @@
{
public:
//----[language demanded functions]----
- DivisionController(Context* context);
+ DivisionController(Context* context);
- virtual ~DivisionController();
+ virtual ~DivisionController();
//----[/language demanded functions]----
//----[orxonox demanded functions]----
Modified: code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc
===================================================================
--- code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc 2016-01-02 22:49:25 UTC (rev 11024)
+++ code/branches/presentationHS15/src/orxonox/controllers/FightingController.cc 2016-01-03 13:39:10 UTC (rev 11025)
@@ -46,7 +46,7 @@
FightingController::FightingController( Context* context ): FlyingController( context )
{
- this->attackRange_ = 2500;
+ this->attackRange_ = 2500;
this->stopLookingAtTarget();
this->bSetupWorked = false;
this->timeout_ = 0;
Modified: code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc
===================================================================
--- code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc 2016-01-02 22:49:25 UTC (rev 11024)
+++ code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.cc 2016-01-03 13:39:10 UTC (rev 11025)
@@ -35,28 +35,28 @@
namespace orxonox
{
- RegisterClass(ExplosionPart);
+ RegisterClass(ExplosionPart);
- ExplosionPart::ExplosionPart(Context* context) : MovableEntity(context)
- {
- RegisterObject(ExplosionPart);
- this->bStop_ = false;
+ ExplosionPart::ExplosionPart(Context* context) : MovableEntity(context)
+ {
+ RegisterObject(ExplosionPart);
+ this->bStop_ = false;
this->LOD_ = LODParticle::Normal;
- this->mesh_ = "";
- this->effect1_ = "";
- this->effect2_ = "";
- this->model_= new Model(this->getContext());
- this->effect1Particle_= NULL;
- this->effect2Particle_= NULL;
- this->explosionEntity_ = new MovableEntity(this->getContext());
- this->posOffset_ = Vector3::ZERO;
+ this->mesh_ = "";
+ this->effect1_ = "";
+ this->effect2_ = "";
+ this->model_= new Model(this->getContext());
+ this->effect1Particle_= NULL;
+ this->effect2Particle_= NULL;
+ this->explosionEntity_ = new MovableEntity(this->getContext());
+ this->posOffset_ = Vector3::ZERO;
- }
+ }
- ExplosionPart::~ExplosionPart()
+ ExplosionPart::~ExplosionPart()
{
if (this->isInitialized())
{
@@ -74,30 +74,30 @@
}
- void ExplosionPart::XMLPort(Element& xmlelement, XMLPort::Mode mode)
- {
- SUPER(ExplosionPart, XMLPort, xmlelement, mode);
+ void ExplosionPart::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ SUPER(ExplosionPart, XMLPort, xmlelement, mode);
- XMLPortParam(ExplosionPart, "mesh", setMesh, getMesh, xmlelement, mode).defaultValues(""); //Define mesh file, that is going to fly out
- XMLPortParam(ExplosionPart, "minspeed", setMinSpeed, getMinSpeed, xmlelement, mode).defaultValues(50); //Minimum velocity at which parts fly out
- XMLPortParam(ExplosionPart, "maxspeed", setMaxSpeed, getMaxSpeed, xmlelement, mode).defaultValues(100); //Maximum velocity at which parts fly out, set both minspeed and maxspeed to 0 to have stationary effects
- XMLPortParam(ExplosionPart, "effect1", setEffect1, getEffect1, xmlelement, mode).defaultValues(""); //particle effect 1
- XMLPortParam(ExplosionPart, "effect2", setEffect2, getEffect2, xmlelement, mode).defaultValues(""); //particle effect 2
- XMLPortParam(ExplosionPart, "offset", setOffset, getOffset, xmlelement, mode).defaultValues(Vector3::ZERO); //Offset of the position if you need to have an explosion off-center
- XMLPortParam(ExplosionPart, "direction", setDirection, getDirection, xmlelement, mode).defaultValues(Vector3(1,1,1)); //general direction the parts fly in
- XMLPortParam(ExplosionPart, "angle", setAngle, getAngle, xmlelement, mode).defaultValues(180); //defines a cone shape with direction "direction" and angle "angle" inside which the parts fly out of
- XMLPortParam(ExplosionPart, "delay", setDelay, getDelay, xmlelement, mode).defaultValues(0); //delay to the explosion in seconds
- }
+ XMLPortParam(ExplosionPart, "mesh", setMesh, getMesh, xmlelement, mode).defaultValues(""); //Define mesh file, that is going to fly out
+ XMLPortParam(ExplosionPart, "minspeed", setMinSpeed, getMinSpeed, xmlelement, mode).defaultValues(50); //Minimum velocity at which parts fly out
+ XMLPortParam(ExplosionPart, "maxspeed", setMaxSpeed, getMaxSpeed, xmlelement, mode).defaultValues(100); //Maximum velocity at which parts fly out, set both minspeed and maxspeed to 0 to have stationary effects
+ XMLPortParam(ExplosionPart, "effect1", setEffect1, getEffect1, xmlelement, mode).defaultValues(""); //particle effect 1
+ XMLPortParam(ExplosionPart, "effect2", setEffect2, getEffect2, xmlelement, mode).defaultValues(""); //particle effect 2
+ XMLPortParam(ExplosionPart, "offset", setOffset, getOffset, xmlelement, mode).defaultValues(Vector3::ZERO); //Offset of the position if you need to have an explosion off-center
+ XMLPortParam(ExplosionPart, "direction", setDirection, getDirection, xmlelement, mode).defaultValues(Vector3(1,1,1)); //general direction the parts fly in
+ XMLPortParam(ExplosionPart, "angle", setAngle, getAngle, xmlelement, mode).defaultValues(180); //defines a cone shape with direction "direction" and angle "angle" inside which the parts fly out of
+ XMLPortParam(ExplosionPart, "delay", setDelay, getDelay, xmlelement, mode).defaultValues(0); //delay to the explosion in seconds
+ }
- void ExplosionPart::Explode()
- {
- this->destroyTimer_.setTimer(delay_, false, createExecutor(createFunctor(&ExplosionPart::ActuallyExplode, this)));
- }
+ void ExplosionPart::Explode()
+ {
+ this->destroyTimer_.setTimer(delay_, false, createExecutor(createFunctor(&ExplosionPart::ActuallyExplode, this)));
+ }
- void ExplosionPart::stop()
- {
- if (this->effect1Particle_)
+ void ExplosionPart::stop()
+ {
+ if (this->effect1Particle_)
this->effect1Particle_->setEnabled(false);
if (this->effect2Particle_)
this->effect2Particle_->setEnabled(false);
@@ -109,34 +109,34 @@
this->bStop_ = true;
this->destroyTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&ExplosionPart::destroy, this)));
}
- }
+ }
- void ExplosionPart::ActuallyExplode()
- {
- this->model_->setVisible(true);
+ void ExplosionPart::ActuallyExplode()
+ {
+ this->model_->setVisible(true);
- //this->explosionEntity_->setSyncMode(0);
+ //this->explosionEntity_->setSyncMode(0);
- //this->model_->setSyncMode(0);
+ //this->model_->setSyncMode(0);
- if(effect1_ != "")
- {
- this->effect1Particle_ = new ParticleInterface(this->getScene()->getSceneManager(), effect1_, this->LOD_);
- this->effect1Particle_->setDimensions(this->getScale());
- this->model_->attachOgreObject(this->effect1Particle_->getParticleSystem());
- }
+ if(effect1_ != "")
+ {
+ this->effect1Particle_ = new ParticleInterface(this->getScene()->getSceneManager(), effect1_, this->LOD_);
+ this->effect1Particle_->setDimensions(this->getScale());
+ this->model_->attachOgreObject(this->effect1Particle_->getParticleSystem());
+ }
- if(effect2_ != "")
- {
- this->effect2Particle_ = new ParticleInterface(this->getScene()->getSceneManager(), effect2_, this->LOD_);
- this->effect2Particle_->setDimensions(this->getScale());
- this->model_->attachOgreObject(this->effect2Particle_->getParticleSystem());
- }
+ if(effect2_ != "")
+ {
+ this->effect2Particle_ = new ParticleInterface(this->getScene()->getSceneManager(), effect2_, this->LOD_);
+ this->effect2Particle_->setDimensions(this->getScale());
+ this->model_->attachOgreObject(this->effect2Particle_->getParticleSystem());
+ }
-
+
Vector3 velocityOffset = direction_.perpendicular();
velocityOffset.normalise();
Degree offsetDirection = Degree(rnd(0,360));
@@ -146,7 +146,7 @@
Vector3 finalDirection = direction_ + sin((rnd(0, angle_))*M_PI/180)*velocityOffset;
- this->explosionEntity_->setVelocity(finalDirection*rnd(minSpeed_,maxSpeed_));
+ this->explosionEntity_->setVelocity(finalDirection*rnd(minSpeed_,maxSpeed_));
this->explosionEntity_->setAngularVelocity(Vector3(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1)).normalisedCopy() * Degree(400).valueRadians());
this->explosionEntity_->setScale(this->getScale() * 4);
@@ -160,101 +160,101 @@
{
this->destroyTimer_.setTimer(rnd(2, 4), false, createExecutor(createFunctor(&ExplosionPart::stop, this)));
}
- }
+ }
- void ExplosionPart::setMesh(const std::string& newString)
- {
- if(newString != "")
- {
- this->mesh_ = newString;
- this->model_->setMeshSource(mesh_);
- this->model_->setVisible(false);
- }
- }
+ void ExplosionPart::setMesh(const std::string& newString)
+ {
+ if(newString != "")
+ {
+ this->mesh_ = newString;
+ this->model_->setMeshSource(mesh_);
+ this->model_->setVisible(false);
+ }
+ }
- void ExplosionPart::setEffect1(const std::string& newString)
- {
- this->effect1_ = newString;
- }
+ void ExplosionPart::setEffect1(const std::string& newString)
+ {
+ this->effect1_ = newString;
+ }
- void ExplosionPart::setEffect2(const std::string& newString)
- {
- this->effect2_ = newString;
- }
+ void ExplosionPart::setEffect2(const std::string& newString)
+ {
+ this->effect2_ = newString;
+ }
- void ExplosionPart::setMinSpeed(float speed)
- {
- this->minSpeed_ = speed;
- }
+ void ExplosionPart::setMinSpeed(float speed)
+ {
+ this->minSpeed_ = speed;
+ }
- void ExplosionPart::setMaxSpeed(float speed)
- {
- this->maxSpeed_ = speed;
- }
+ void ExplosionPart::setMaxSpeed(float speed)
+ {
+ this->maxSpeed_ = speed;
+ }
- void ExplosionPart::setOffset(Vector3 newVector)
- {
- this->posOffset_ = newVector;
- this->explosionEntity_->setPosition(this->getPosition() + this->posOffset_ / this->getScale());
- }
+ void ExplosionPart::setOffset(Vector3 newVector)
+ {
+ this->posOffset_ = newVector;
+ this->explosionEntity_->setPosition(this->getPosition() + this->posOffset_ / this->getScale());
+ }
- void ExplosionPart::setDirection(Vector3 newDirection)
- {
- this->direction_ = newDirection;
- }
+ void ExplosionPart::setDirection(Vector3 newDirection)
+ {
+ this->direction_ = newDirection;
+ }
- void ExplosionPart::setAngle(float newAngle)
- {
- this->angle_ = newAngle;
- }
+ void ExplosionPart::setAngle(float newAngle)
+ {
+ this->angle_ = newAngle;
+ }
- void ExplosionPart::setDelay(float newDelay)
- {
- this->delay_ = newDelay;
- }
+ void ExplosionPart::setDelay(float newDelay)
+ {
+ this->delay_ = newDelay;
+ }
- std::string& ExplosionPart::getMesh()
- { return this->mesh_; }
+ std::string& ExplosionPart::getMesh()
+ { return this->mesh_; }
- std::string& ExplosionPart::getEffect1()
- { return this->effect1_; }
+ std::string& ExplosionPart::getEffect1()
+ { return this->effect1_; }
- std::string& ExplosionPart::getEffect2()
- { return this->effect2_; }
+ std::string& ExplosionPart::getEffect2()
+ { return this->effect2_; }
- float ExplosionPart::getMinSpeed()
- {
- return this->minSpeed_;
- }
+ float ExplosionPart::getMinSpeed()
+ {
+ return this->minSpeed_;
+ }
- float ExplosionPart::getMaxSpeed()
- {
- return this->maxSpeed_;
- }
+ float ExplosionPart::getMaxSpeed()
+ {
+ return this->maxSpeed_;
+ }
- Vector3 ExplosionPart::getOffset()
- {
- return this->posOffset_;
- }
+ Vector3 ExplosionPart::getOffset()
+ {
+ return this->posOffset_;
+ }
- Vector3 ExplosionPart::getDirection()
- {
- return direction_;
- }
+ Vector3 ExplosionPart::getDirection()
+ {
+ return direction_;
+ }
- float ExplosionPart::getAngle()
- {
- return angle_;
- }
+ float ExplosionPart::getAngle()
+ {
+ return angle_;
+ }
- float ExplosionPart::getDelay()
- {
- return delay_;
- }
+ float ExplosionPart::getDelay()
+ {
+ return delay_;
+ }
-}
\ No newline at end of file
+}
Modified: code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.h
===================================================================
--- code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.h 2016-01-02 22:49:25 UTC (rev 11024)
+++ code/branches/presentationHS15/src/orxonox/worldentities/ExplosionPart.h 2016-01-03 13:39:10 UTC (rev 11025)
@@ -81,15 +81,15 @@
LODParticle::Value LOD_;
- Model* model_;
- ParticleInterface* effect1Particle_;
+ Model* model_;
+ ParticleInterface* effect1Particle_;
ParticleInterface* effect2Particle_;
float minSpeed_;
float maxSpeed_;
- std::string mesh_;
- std::string effect1_;
+ std::string mesh_;
+ std::string effect1_;
std::string effect2_;
Vector3 posOffset_;
Vector3 direction_;
@@ -100,9 +100,9 @@
Timer destroyTimer_;
-
+
};
}
-#endif /* _ExplosionPart_H__ */
\ No newline at end of file
+#endif /* _ExplosionPart_H__ */
More information about the Orxonox-commit
mailing list