[Orxonox-commit 2062] r6778 - in code/branches/rocket/src: modules/weapons/projectiles modules/weapons/weaponmodes orxonox/controllers orxonox/gametypes orxonox/worldentities
gnadler at orxonox.net
gnadler at orxonox.net
Mon Apr 26 15:40:16 CEST 2010
Author: gnadler
Date: 2010-04-26 15:40:16 +0200 (Mon, 26 Apr 2010)
New Revision: 6778
Added:
code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc
code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h
code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.cc
code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.h
code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.h
code/branches/rocket/src/orxonox/controllers/DroneController.cc
code/branches/rocket/src/orxonox/controllers/DroneController.h
code/branches/rocket/src/orxonox/controllers/RocketController.cc
code/branches/rocket/src/orxonox/controllers/RocketController.h
code/branches/rocket/src/orxonox/gametypes/Testgame.cc
code/branches/rocket/src/orxonox/gametypes/Testgame.h
code/branches/rocket/src/orxonox/worldentities/Drone.cc
code/branches/rocket/src/orxonox/worldentities/Drone.h
code/branches/rocket/src/orxonox/worldentities/RocketDrone.cc
code/branches/rocket/src/orxonox/worldentities/RocketDrone.h
Modified:
code/branches/rocket/src/modules/weapons/projectiles/CMakeLists.txt
code/branches/rocket/src/modules/weapons/weaponmodes/CMakeLists.txt
code/branches/rocket/src/orxonox/controllers/AIController.cc
code/branches/rocket/src/orxonox/controllers/CMakeLists.txt
code/branches/rocket/src/orxonox/worldentities/CMakeLists.txt
Log:
Modified: code/branches/rocket/src/modules/weapons/projectiles/CMakeLists.txt
===================================================================
--- code/branches/rocket/src/modules/weapons/projectiles/CMakeLists.txt 2010-04-26 12:48:12 UTC (rev 6777)
+++ code/branches/rocket/src/modules/weapons/projectiles/CMakeLists.txt 2010-04-26 13:40:16 UTC (rev 6778)
@@ -4,4 +4,5 @@
Projectile.cc
LightningGunProjectile.cc
Rocket.cc
+ SimpleRocket.cc
)
Added: code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc (rev 0)
+++ code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.cc 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,259 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "SimpleRocket.h"
+
+#include <BulletDynamics/Dynamics/btRigidBody.h>
+
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "worldentities/pawns/Pawn.h"
+#include "graphics/ParticleSpawner.h"
+#include "graphics/Model.h"
+#include "objects/collisionshapes/ConeCollisionShape.h"
+#include "infos/PlayerInfo.h"
+#include "controllers/Controller.h"
+#include "controllers/RocketController.h"
+#include "sound/WorldSound.h"
+
+namespace orxonox
+{
+ CreateFactory(SimpleRocket);
+ // create the factory for the SimpleRocket
+
+ /**
+ @brief
+ Constructor. Registers the object and initializes some default values.
+ */
+ SimpleRocket::SimpleRocket(BaseObject* creator) : ControllableEntity(creator)
+ {
+ RegisterObject(SimpleRocket);// - register the SimpleRocket class to the core
+
+ this->localAngularVelocity_ = 0;
+ this->bDestroy_ = false;
+ this->lifetime_ = 100;
+ //this->camera_ = null;
+ RocketController* myController = new RocketController();
+ this->setController(myController));
+ myController->setControllableEntity(this);
+ //this->getController()->setControllableEntity(this);
+ //this->controllableEntity_->setController(this->controller_);
+
+ if (GameMode::isMaster())
+ {
+ this->setCollisionType(WorldEntity::Kinematic);
+ this->setVelocity(0,0,-100);
+
+ Model* model = new Model(this);
+ model->setMeshSource("Rocket.mesh");
+ model->scale(0.7f);
+ this->attach(model);
+ ParticleEmitter* fire = new ParticleEmitter(this);
+ this->attach(fire);
+ fire->setOrientation(this->getOrientation());
+ fire->setSource("Orxonox/Rocketfire");
+
+ this->enableCollisionCallback();
+ this->setCollisionResponse(false);
+ this->setCollisionType(Kinematic);
+
+ ConeCollisionShape* collisionShape = new ConeCollisionShape(this);
+ collisionShape->setRadius(3);
+ collisionShape->setHeight(500);
+ this->attachCollisionShape(collisionShape);
+
+ this->destroyTimer_.setTimer(this->lifetime_, false, createExecutor(createFunctor(&SimpleRocket::destroyObject, this)));
+ }
+ this->
+
+ }
+
+ /**
+ @brief
+ Destructor. Destroys controller, if present and kills sounds, if playing.
+ */
+ SimpleRocket::~SimpleRocket()
+ {
+ }
+
+ /**
+ @brief
+ Method for creating a SimpleRocket through XML.
+ */
+ void SimpleRocket::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ // this calls the XMLPort function of the parent class
+ SUPER(SimpleRocket, XMLPort, xmlelement, mode);
+ }
+
+ void SimpleRocket::setOwner(Pawn* owner)
+ {
+ this->owner_ = owner;
+ //this->originalControllableEntity_ = this->owner_->getPlayer()->getControllableEntity();
+ this->player_ = this->owner_->getPlayer();
+ }
+
+ /**
+ @brief
+ Defines which actions the SimpleRocket has to take in each tick.
+ @param dt
+ The length of the tick.
+ */
+ void SimpleRocket::tick(float dt)
+ {
+ SUPER(SimpleRocket, tick, dt);
+
+ if( this->hasLocalController() )
+ {
+ this->setAngularVelocity(this->getOrientation() * this->localAngularVelocity_);
+ this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
+ this->localAngularVelocity_ = 0;
+
+ if( this->bDestroy_ )
+ this->destroy();
+ }
+ }
+
+ bool SimpleRocket::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+ {
+ if (!this->bDestroy_ && GameMode::isMaster())
+ {
+ if (otherObject == this->owner_)
+ return false;
+
+ this->bDestroy_ = true;
+
+ if (this->owner_)
+ {
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("Orxonox/explosion4");
+ effect->setLifetime(2.0f);
+ }
+
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("Orxonox/smoke4");
+ effect->setLifetime(3.0f);
+ }
+ }
+
+ float dmg = this->damage_;
+ if (this->owner_)
+ dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
+
+ Pawn* victim = orxonox_cast<Pawn*>(otherObject);
+ if (victim)
+ victim->hit(this->owner_, contactPoint, dmg);
+// this->destroy();
+ }
+ return false;
+ }
+
+ void SimpleRocket::destroyObject()
+ {
+ if (GameMode::isMaster())
+ {
+ this->destroy();
+ }
+ }
+
+ void SimpleRocket::fired(unsigned int firemode)
+ {
+ if (this->owner_)
+ {
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("Orxonox/explosion4");
+ effect->setLifetime(2.0f);
+ }
+
+ {
+ ParticleSpawner* effect = new ParticleSpawner(this->owner_->getCreator());
+ effect->setPosition(this->getPosition());
+ effect->setOrientation(this->getOrientation());
+ effect->setDestroyAfterLife(true);
+ effect->setSource("Orxonox/smoke4");
+ effect->setLifetime(3.0f);
+ }
+ this->destroy();
+ }
+ }
+
+ /**
+ @brief
+ Rotates the SimpleRocket around the y-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void SimpleRocket::rotateYaw(const Vector2& value)
+ {
+ ControllableEntity::rotateYaw(value);
+
+ if( !this->isInMouseLook() )
+ this->localAngularVelocity_.y += value.x;
+ }
+
+ /**
+ @brief
+ Rotates the SimpleRocket around the x-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void SimpleRocket::rotatePitch(const Vector2& value)
+ {
+ ControllableEntity::rotatePitch(value);
+
+ if( !this->isInMouseLook() )
+ this->localAngularVelocity_.x += value.x;
+ }
+
+ /**
+ @brief
+ Rotates the SimpleRocket around the z-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void SimpleRocket::rotateRoll(const Vector2& value)
+ {
+ ControllableEntity::rotateRoll(value);
+
+ if( !this->isInMouseLook() )
+ this->localAngularVelocity_.z += value.x;
+ }
+
+}
Added: code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h
===================================================================
--- code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h (rev 0)
+++ code/branches/rocket/src/modules/weapons/projectiles/SimpleRocket.h 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,130 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _SimpleRocket_H__
+#define _SimpleRocket_H__
+
+#include "weapons/WeaponsPrereqs.h"
+
+#include "tools/Timer.h"
+#include "worldentities/ControllableEntity.h"
+
+namespace orxonox
+{
+ class ConeCollisionShape;
+
+ /**
+ @brief
+ SimpleRocket, that is made to move upon a specified pattern.
+ This class was constructed for the PPS tutorial.
+ @author
+ Oli Scheuss
+ */
+ class _WeaponsExport SimpleRocket : public ControllableEntity
+ {
+ public:
+ SimpleRocket(BaseObject* creator);
+ virtual ~SimpleRocket();
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a SimpleRocket through XML.
+ virtual void tick(float dt); //!< Defines which actions the SimpleRocket has to take in each tick.
+
+ virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
+ void destroyObject();
+
+ virtual void moveFrontBack(const Vector2& value){}
+ virtual void moveRightLeft(const Vector2& value){}
+ virtual void moveUpDown(const Vector2& value){}
+
+ virtual void rotateYaw(const Vector2& value);
+ virtual void rotatePitch(const Vector2& value);
+ virtual void rotateRoll(const Vector2& value);
+
+ /**
+ @brief Moves the SimpleRocket in the Front/Back-direction by the specifed amount.
+ @param value The amount by which the SimpleRocket is to be moved.
+ */
+ inline void moveFrontBack(float value)
+ { this->moveFrontBack(Vector2(value, 0)); }
+ /**
+ @brief Moves the SimpleRocket in the Right/Left-direction by the specifed amount.
+ @param value The amount by which the SimpleRocket is to be moved.
+ */
+ inline void moveRightLeft(float value)
+ { this->moveRightLeft(Vector2(value, 0)); }
+ /**
+ @brief Moves the SimpleRocket in the Up/Down-direction by the specifed amount.
+ @param value The amount by which the SimpleRocket is to be moved.
+ */
+ inline void moveUpDown(float value)
+ { this->moveUpDown(Vector2(value, 0)); }
+
+ /**
+ @brief Rotates the SimpleRocket around the y-axis by the specifed amount.
+ @param value The amount by which the SimpleRocket is to be rotated.
+ */
+ inline void rotateYaw(float value)
+ { this->rotateYaw(Vector2(value, 0)); }
+ /**
+ @brief Rotates the SimpleRocket around the x-axis by the specifed amount.
+ @param value The amount by which the SimpleRocket is to be rotated.
+ */
+ inline void rotatePitch(float value)
+ { this->rotatePitch(Vector2(value, 0)); }
+ /**
+ @brief Rotates the SimpleRocket around the z-axis by the specifed amount.
+ @param value The amount by which the SimpleRocket is to be rotated.
+ */
+ inline void rotateRoll(float value)
+ { this->rotateRoll(Vector2(value, 0)); }
+
+ void setOwner(Pawn* owner);
+ inline Pawn* getOwner() const
+ { return this->owner_; }
+
+ inline void setDamage(float damage)
+ { this->damage_ = damage; }
+ inline float getDamage() const
+ { return this->damage_; }
+ virtual void fired(unsigned int firemode);
+
+ private:
+ WeakPtr<Pawn> owner_;
+ Vector3 localAngularVelocity_;
+ float damage_;
+ bool bDestroy_;
+
+ WeakPtr<PlayerInfo> player_;
+ Timer destroyTimer_;
+ float lifetime_;
+
+ };
+
+}
+
+#endif /* _SimpleRocket_H__ */
Modified: code/branches/rocket/src/modules/weapons/weaponmodes/CMakeLists.txt
===================================================================
--- code/branches/rocket/src/modules/weapons/weaponmodes/CMakeLists.txt 2010-04-26 12:48:12 UTC (rev 6777)
+++ code/branches/rocket/src/modules/weapons/weaponmodes/CMakeLists.txt 2010-04-26 13:40:16 UTC (rev 6778)
@@ -5,4 +5,5 @@
HsW01.cc
LightningGun.cc
RocketFire.cc
+ SimpleRocketFire.cc
)
Added: code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.cc
===================================================================
--- code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.cc (rev 0)
+++ code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.cc 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,74 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "DroneFire.h"
+
+#include "util/Math.h"
+#include "core/CoreIncludes.h"
+#include "worldentities/RocketDrone.h"
+
+#include "weaponsystem/Weapon.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSystem.h"
+#include "worldentities/pawns/Pawn.h"
+
+namespace orxonox
+{
+ CreateFactory(DroneFire);
+
+ DroneFire::DroneFire(BaseObject* creator) : WeaponMode(creator)
+ {
+ RegisterObject(DroneFire);
+
+ // this->reloadTime_ = 2f;
+ //this->bParallelReload_ = false;
+ //this->damage_ = 100;
+ //this->speed_ = 100;
+
+ this->setMunitionName("LaserMunition");
+ // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
+ }
+
+ DroneFire::~DroneFire()
+ {
+ }
+
+ void DroneFire::fire()
+ {
+ RocketDrone* rocket = new RocketDrone(this);
+
+ //this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+ //rocket->setOrientation(this->getMuzzleOrientation());
+ //rocket->setPosition(this->getMuzzlePosition());
+ //rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
+ //rocket->scale(2);
+
+ //rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+ //rocket->setDamage(this->getDamage());
+ }
+}
Added: code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.h
===================================================================
--- code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.h (rev 0)
+++ code/branches/rocket/src/modules/weapons/weaponmodes/DroneFire.h 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,50 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _DroneFire_H__
+#define _DroneFire_H__
+
+#include "weapons/WeaponsPrereqs.h"
+#include "weaponsystem/WeaponMode.h"
+
+namespace orxonox
+{
+ class _WeaponsExport DroneFire : public WeaponMode
+ {
+ public:
+ DroneFire(BaseObject* creator);
+ virtual ~DroneFire();
+
+ virtual void fire();
+
+ private:
+ float speed_;
+ };
+}
+
+#endif /* _DroneFire_H__ */
Added: code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
===================================================================
--- code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc (rev 0)
+++ code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.cc 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,74 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "SimpleRocketFire.h"
+
+#include "util/Math.h"
+#include "core/CoreIncludes.h"
+#include "weapons/projectiles/SimpleRocket.h"
+
+#include "weaponsystem/Weapon.h"
+#include "weaponsystem/WeaponPack.h"
+#include "weaponsystem/WeaponSystem.h"
+#include "worldentities/pawns/Pawn.h"
+
+namespace orxonox
+{
+ CreateFactory(SimpleRocketFire);
+
+ SimpleRocketFire::SimpleRocketFire(BaseObject* creator) : WeaponMode(creator)
+ {
+ RegisterObject(SimpleRocketFire);
+
+ this->reloadTime_ = 0.20f;
+ this->bParallelReload_ = false;
+ this->damage_ = 100;
+ this->speed_ = 500;
+
+ this->setMunitionName("LaserMunition");
+ // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
+ }
+
+ SimpleRocketFire::~SimpleRocketFire()
+ {
+ }
+
+ void SimpleRocketFire::fire()
+ {
+ SimpleRocket* rocket = new SimpleRocket(this);
+
+ this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
+ rocket->setOrientation(this->getMuzzleOrientation());
+ rocket->setPosition(this->getMuzzlePosition());
+ rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
+ rocket->scale(2);
+
+ rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
+ rocket->setDamage(this->getDamage());
+ }
+}
Added: code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.h
===================================================================
--- code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.h (rev 0)
+++ code/branches/rocket/src/modules/weapons/weaponmodes/SimpleRocketFire.h 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,50 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oliver Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _SimpleRocketFire_H__
+#define _SimpleRocketFire_H__
+
+#include "weapons/WeaponsPrereqs.h"
+#include "weaponsystem/WeaponMode.h"
+
+namespace orxonox
+{
+ class _WeaponsExport SimpleRocketFire : public WeaponMode
+ {
+ public:
+ SimpleRocketFire(BaseObject* creator);
+ virtual ~SimpleRocketFire();
+
+ virtual void fire();
+
+ private:
+ float speed_;
+ };
+}
+
+#endif /* _SimpleRocketFire_H__ */
Modified: code/branches/rocket/src/orxonox/controllers/AIController.cc
===================================================================
--- code/branches/rocket/src/orxonox/controllers/AIController.cc 2010-04-26 12:48:12 UTC (rev 6777)
+++ code/branches/rocket/src/orxonox/controllers/AIController.cc 2010-04-26 13:40:16 UTC (rev 6778)
@@ -56,19 +56,19 @@
float maxrand = 100.0f / ACTION_INTERVAL;
// search enemy
- random = rnd(maxrand);
+ /* random = rnd(maxrand);
if (random < 15 && (!this->target_))
- this->searchNewTarget();
+ this->searchNewTarget();*/
// forget enemy
- random = rnd(maxrand);
- if (random < 5 && (this->target_))
- this->forgetTarget();
+ //random = rnd(maxrand);
+ //if (random < 5 && (this->target_))
+ // this->forgetTarget();
// next enemy
- random = rnd(maxrand);
+ /* random = rnd(maxrand);
if (random < 10 && (this->target_))
- this->searchNewTarget();
+ this->searchNewTarget();*/
// fly somewhere
random = rnd(maxrand);
@@ -86,14 +86,14 @@
this->searchRandomTargetPosition();
// shoot
- random = rnd(maxrand);
- if (random < 75 && (this->target_ && !this->bShooting_))
- this->bShooting_ = true;
+ //random = rnd(maxrand);
+ //if (random < 75 && (this->target_ && !this->bShooting_))
+ // this->bShooting_ = true;
- // stop shooting
- random = rnd(maxrand);
- if (random < 25 && (this->bShooting_))
- this->bShooting_ = false;
+ //// stop shooting
+ //random = rnd(maxrand);
+ //if (random < 25 && (this->bShooting_))
+ // this->bShooting_ = false;
}
void AIController::tick(float dt)
Modified: code/branches/rocket/src/orxonox/controllers/CMakeLists.txt
===================================================================
--- code/branches/rocket/src/orxonox/controllers/CMakeLists.txt 2010-04-26 12:48:12 UTC (rev 6777)
+++ code/branches/rocket/src/orxonox/controllers/CMakeLists.txt 2010-04-26 13:40:16 UTC (rev 6778)
@@ -7,4 +7,5 @@
ScriptController.cc
WaypointController.cc
WaypointPatrolController.cc
+ RocketController.cc
)
Added: code/branches/rocket/src/orxonox/controllers/DroneController.cc
===================================================================
--- code/branches/rocket/src/orxonox/controllers/DroneController.cc (rev 0)
+++ code/branches/rocket/src/orxonox/controllers/DroneController.cc 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,77 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oli Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "DroneController.h"
+#include "worldentities/Drone.h"
+#include "util/Math.h"
+
+
+namespace orxonox
+{
+ /**
+ @brief
+ Constructor.
+ */
+ DroneController::DroneController(BaseObject* creator) : Controller(creator)
+ {
+ RegisterObject(DroneController);
+ // Place your code here:
+ // - make sure to register the object in the factory
+ // - do any kind of initialisation
+
+ // this checks that our creator really is a drone
+ // and saves the pointer to the drone for the controlling commands
+ assert(dynamic_cast<Drone*>(creator)!=0);
+ this->setControllableEntity(dynamic_cast<Drone*>(creator));
+ }
+
+ DroneController::~DroneController()
+ {
+ }
+
+ /**
+ @brief
+ The controlling happens here. This method defines what the controller has to do each tick.
+ @param dt
+ The duration of the tick.
+ */
+ void DroneController::tick(float dt)
+ {
+ // Place your code here:
+ // - steering commands
+ Drone *myDrone = static_cast<Drone*>(this->getControllableEntity());
+ // you can use the following commands for steering
+ // - moveFrontBack, moveRightLeft, moveUpDown
+ // - rotatePitch, rotateYaw, rotateRoll
+ // - apply the to myDrone (e.g. myDrone->rotateYaw(..) )
+
+ myDrone->rotateYaw(0.2);
+ myDrone->moveFrontBack(2);
+
+ }
+}
Added: code/branches/rocket/src/orxonox/controllers/DroneController.h
===================================================================
--- code/branches/rocket/src/orxonox/controllers/DroneController.h (rev 0)
+++ code/branches/rocket/src/orxonox/controllers/DroneController.h 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,59 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oli Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _DroneController_H__
+#define _DroneController_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "Controller.h"
+#include "tools/interfaces/Tickable.h"
+
+namespace orxonox
+{
+ /**
+ @brief
+ Controller for the Drone of the PPS tutorial.
+ @author
+ Oli Scheuss
+ */
+ class _OrxonoxExport DroneController : public Controller, public Tickable
+ {
+ public:
+ DroneController(BaseObject* creator);
+ virtual ~DroneController();
+
+ virtual void tick(float dt); //!< The controlling happens here. This method defines what the controller has to do each tick.
+
+ protected:
+
+ private:
+ };
+}
+
+#endif /* _DroneController_H__ */
Added: code/branches/rocket/src/orxonox/controllers/RocketController.cc
===================================================================
--- code/branches/rocket/src/orxonox/controllers/RocketController.cc (rev 0)
+++ code/branches/rocket/src/orxonox/controllers/RocketController.cc 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,74 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oli Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "RocketController.h"
+#include "modules\weapons\projectiles\SimpleRocket.h"
+#include "util/Math.h"
+
+
+namespace orxonox
+{
+ /**
+ @brief
+ Constructor.
+ */
+ RocketController::RocketController(BaseObject* creator) : Controller(creator)
+ {
+ // Place your code here:
+ // - make sure to register the object in the factory
+ // - do any kind of initialisation
+ RegisterObject(RocketController);
+ // this checks that our creator really is a drone
+ // and saves the pointer to the drone for the controlling commands
+ }
+
+ RocketController::~RocketController()
+ {
+ }
+
+ /**
+ @brief
+ The controlling happens here. This method defines what the controller has to do each tick.
+ @param dt
+ The duration of the tick.
+ */
+ void RocketController::tick(float dt)
+ {
+ // Place your code here:
+ // - steering commands
+ SimpleRocket* rocket = static_cast<SimpleRocket>(this->getControllableEntity());
+ // you can use the following commands for steering
+ // - moveFrontBack, moveRightLeft, moveUpDown
+ // - rotatePitch, rotateYaw, rotateRoll
+ // - apply the to myDrone (e.g. myDrone->rotateYaw(..) )
+
+ rocket->rotateYaw(0.2);
+ rocket->moveFrontBack(2);
+
+ }
+}
Added: code/branches/rocket/src/orxonox/controllers/RocketController.h
===================================================================
--- code/branches/rocket/src/orxonox/controllers/RocketController.h (rev 0)
+++ code/branches/rocket/src/orxonox/controllers/RocketController.h 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,59 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oli Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _RocketController_H__
+#define _RocketController_H__
+
+#include "OrxonoxPrereqs.h"
+
+#include "Controller.h"
+#include "tools/interfaces/Tickable.h"
+
+namespace orxonox
+{
+ /**
+ @brief
+ Controller for the Drone of the PPS tutorial.
+ @author
+ Oli Scheuss
+ */
+ class _OrxonoxExport RocketController : public Controller, public Tickable
+ {
+ public:
+ RocketController(BaseObject* creator);
+ virtual ~RocketController();
+
+ virtual void tick(float dt); //!< The controlling happens here. This method defines what the controller has to do each tick.
+
+ protected:
+
+ private:
+ };
+}
+
+#endif /* _RocketController_H__ */
Added: code/branches/rocket/src/orxonox/gametypes/Testgame.cc
===================================================================
--- code/branches/rocket/src/orxonox/gametypes/Testgame.cc (rev 0)
+++ code/branches/rocket/src/orxonox/gametypes/Testgame.cc 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,87 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Aurelian Jaggi
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "Asteroids.h"
+
+#include "core/CoreIncludes.h"
+#include "network/Host.h"
+#include "worldentities/pawns/Pawn.h"
+
+namespace orxonox
+{
+ CreateUnloadableFactory(Asteroids);
+
+ Asteroids::Asteroids(BaseObject* creator) : Gametype(creator)
+ {
+ RegisterObject(Asteroids);
+ this->firstCheckpointReached_ = false;
+ }
+
+ void Asteroids::tick(float dt)
+ {
+ SUPER(Asteroids, tick, dt);
+
+ if (firstCheckpointReached_ && !this->timerIsActive_)
+ {
+ this->startTimer();
+ }
+
+ if (this->time_ < 0 && !this->hasEnded() && this->timerIsActive_)
+ {
+ this->gtinfo_->sendAnnounceMessage("Time's up - you have lost the match!");
+ this->end();
+ }
+ }
+
+ void Asteroids::pawnKilled(Pawn* victim, Pawn* killer)
+ {
+ if (victim && victim->getPlayer())
+ {
+ this->gtinfo_->sendAnnounceMessage("You're dead - you have lost the match!");
+ this->end();
+ }
+ }
+
+ void Asteroids::start()
+ {
+ Gametype::start();
+
+ std::string message("The match has started! Reach the first chekpoint within 15 seconds! But be aware, there may be pirates around...");
+ COUT(0) << message << std::endl;
+ Host::Broadcast(message);
+ }
+
+ void Asteroids::end()
+ {
+ Gametype::end();
+
+ std::string message("The match has ended.");
+ COUT(0) << message << std::endl;
+ Host::Broadcast(message);
+ }
+}
Added: code/branches/rocket/src/orxonox/gametypes/Testgame.h
===================================================================
--- code/branches/rocket/src/orxonox/gametypes/Testgame.h (rev 0)
+++ code/branches/rocket/src/orxonox/gametypes/Testgame.h 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,60 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Aurelian Jaggi
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _Asteroids_H__
+#define _Asteroids_H__
+
+#include "OrxonoxPrereqs.h"
+#include "Gametype.h"
+
+namespace orxonox
+{
+ class _OrxonoxExport Asteroids : public Gametype
+ {
+ public:
+ Asteroids(BaseObject* creator);
+ virtual ~Asteroids() {}
+
+ virtual void tick(float dt);
+
+ virtual void start();
+ virtual void end();
+
+ inline void firstCheckpointReached(bool reached)
+ { this->firstCheckpointReached_ = reached; }
+
+ protected:
+ virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
+
+ private:
+ bool firstCheckpointReached_;
+ bool gameEnded_;
+ };
+}
+
+#endif /* _Asteroids_H__ */
Modified: code/branches/rocket/src/orxonox/worldentities/CMakeLists.txt
===================================================================
--- code/branches/rocket/src/orxonox/worldentities/CMakeLists.txt 2010-04-26 12:48:12 UTC (rev 6777)
+++ code/branches/rocket/src/orxonox/worldentities/CMakeLists.txt 2010-04-26 13:40:16 UTC (rev 6778)
@@ -11,6 +11,7 @@
CameraPosition.cc
SpawnPoint.cc
TeamSpawnPoint.cc
+ Drone.cc
)
ADD_SUBDIRECTORY(pawns)
Added: code/branches/rocket/src/orxonox/worldentities/Drone.cc
===================================================================
--- code/branches/rocket/src/orxonox/worldentities/Drone.cc (rev 0)
+++ code/branches/rocket/src/orxonox/worldentities/Drone.cc 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,185 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oli Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "Drone.h"
+
+#include "core/XMLPort.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+
+namespace orxonox
+{
+ CreateFactory(Drone);
+ // put your code in here:
+ // create the factory for the drone
+
+ /**
+ @brief
+ Constructor. Registers the object and initializes some default values.
+ */
+ Drone::Drone(BaseObject* creator) : ControllableEntity(creator)
+ {
+ RegisterObject(Drone);
+ // put your code in here:
+ // - register the drone class to the core
+ this->myController_ = 0;
+
+ this->localLinearAcceleration_.setValue(0, 0, 0);
+ this->localAngularAcceleration_.setValue(0, 0, 0);
+ this->primaryThrust_ = 100;
+ this->auxilaryThrust_ = 100;
+ this->rotationThrust_ = 10;
+
+ this->setCollisionType(WorldEntity::Dynamic);
+
+ myController_ = new DroneController(static_cast<BaseObject*>(this)); //!< Creates a new controller and passes our this pointer to it as creator.
+ }
+
+ /**
+ @brief
+ Destructor. Destroys controller, if present.
+ */
+ Drone::~Drone()
+ {
+ if( this->isInitialized() && this->myController_ )
+ delete this->myController_;
+ }
+
+ /**
+ @brief
+ Method for creating a Drone through XML.
+ */
+ void Drone::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ // this calls the XMLPort function of the parent class
+ SUPER(Drone, XMLPort, xmlelement, mode);
+
+ // put your code in here:
+ // make sure you add the variables primaryThrust_, auxilaryThrust_ and rotationThrust_ to xmlport
+ // make sure that the set- and get-functions exist.
+ // variables can be added by the following command
+ // XMLPortParam(Classname, "xml-attribute-name (i.e. variablename)", setFunction, getFunction, xmlelement, mode)
+ XMLPortParam(Drone, "primaryThrust_", setPrimaryThrust, getPrimaryThrust, xmlelement, mode);
+ XMLPortParam(Drone, "auxilaryThrust_", setAuxilaryThrust, getAuxilaryThrust, xmlelement, mode);
+ XMLPortParam(Drone, "rotationThrust_", setRotationThrust, getRotationThrust, xmlelement, mode);
+
+ }
+
+ /**
+ @brief
+ Defines which actions the Drone has to take in each tick.
+ @param dt
+ The length of the tick.
+ */
+ void Drone::tick(float dt)
+ {
+ SUPER(Drone, tick, dt);
+
+ //if (this->hasLocalController())
+ //{
+ this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxilaryThrust_);
+ this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() * getMass() * this->auxilaryThrust_);
+ if (this->localLinearAcceleration_.z() > 0)
+ this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->auxilaryThrust_);
+ else
+ this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->primaryThrust_);
+ this->physicalBody_->applyCentralForce(physicalBody_->getWorldTransform().getBasis() * this->localLinearAcceleration_);
+ this->localLinearAcceleration_.setValue(0, 0, 0);
+
+ this->localAngularAcceleration_ *= this->getLocalInertia() * this->rotationThrust_;
+ this->physicalBody_->applyTorque(physicalBody_->getWorldTransform().getBasis() * this->localAngularAcceleration_);
+ this->localAngularAcceleration_.setValue(0, 0, 0);
+ //}
+ }
+
+ /**
+ @brief
+ Moves the Drone in the negative z-direction (Front/Back) by an amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the movement.
+ */
+ void Drone::moveFrontBack(const Vector2& value)
+ {
+ this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() - value.x);
+ }
+
+ /**
+ @brief
+ Moves the Drone in the x-direction (Right/Left) by an amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the movement.
+ */
+ void Drone::moveRightLeft(const Vector2& value)
+ {
+ this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() + value.x);
+ }
+
+ /**
+ @brief
+ Moves the Drone in the y-direction (Up/Down) by an amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the movement.
+ */
+ void Drone::moveUpDown(const Vector2& value)
+ {
+ this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() + value.x);
+ }
+
+ /**
+ @brief
+ Rotates the Drone around the y-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void Drone::rotateYaw(const Vector2& value)
+ {
+ this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x);
+ }
+
+ /**
+ @brief
+ Rotates the Drone around the x-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void Drone::rotatePitch(const Vector2& value)
+ {
+ this->localAngularAcceleration_.setX(this->localAngularAcceleration_.x() + value.x);
+ }
+
+ /**
+ @brief
+ Rotates the Drone around the z-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void Drone::rotateRoll(const Vector2& value)
+ {
+ this->localAngularAcceleration_.setZ(this->localAngularAcceleration_.z() + value.x);
+ }
+
+}
Added: code/branches/rocket/src/orxonox/worldentities/Drone.h
===================================================================
--- code/branches/rocket/src/orxonox/worldentities/Drone.h (rev 0)
+++ code/branches/rocket/src/orxonox/worldentities/Drone.h 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,137 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oli Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _Drone_H__
+#define _Drone_H__
+
+#include "OrxonoxPrereqs.h"
+#include "worldentities/ControllableEntity.h"
+#include "controllers/DroneController.h"
+
+namespace orxonox
+{
+
+ /**
+ @brief
+ Drone, that is made to move upon a specified pattern.
+ This class was constructed for the PPS tutorial.
+ @author
+ Oli Scheuss
+ */
+ class _OrxonoxExport Drone : public ControllableEntity
+ {
+ public:
+ Drone(BaseObject* creator);
+ virtual ~Drone();
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Drone through XML.
+ virtual void tick(float dt); //!< Defines which actions the Drone has to take in each tick.
+
+
+ virtual void moveFrontBack(const Vector2& value);
+ virtual void moveRightLeft(const Vector2& value);
+ virtual void moveUpDown(const Vector2& value);
+
+ virtual void rotateYaw(const Vector2& value);
+ virtual void rotatePitch(const Vector2& value);
+ virtual void rotateRoll(const Vector2& value);
+
+ /**
+ @brief Moves the Drone in the Front/Back-direction by the specifed amount.
+ @param value The amount by which the drone is to be moved.
+ */
+ inline void moveFrontBack(float value)
+ { this->moveFrontBack(Vector2(value, 0)); }
+ /**
+ @brief Moves the Drone in the Right/Left-direction by the specifed amount.
+ @param value The amount by which the drone is to be moved.
+ */
+ inline void moveRightLeft(float value)
+ { this->moveRightLeft(Vector2(value, 0)); }
+ /**
+ @brief Moves the Drone in the Up/Down-direction by the specifed amount.
+ @param value The amount by which the drone is to be moved.
+ */
+ inline void moveUpDown(float value)
+ { this->moveUpDown(Vector2(value, 0)); }
+
+ /**
+ @brief Rotates the Drone around the y-axis by the specifed amount.
+ @param value The amount by which the drone is to be rotated.
+ */
+ inline void rotateYaw(float value)
+ { this->rotateYaw(Vector2(value, 0)); }
+ /**
+ @brief Rotates the Drone around the x-axis by the specifed amount.
+ @param value The amount by which the drone is to be rotated.
+ */
+ inline void rotatePitch(float value)
+ { this->rotatePitch(Vector2(value, 0)); }
+ /**
+ @brief Rotates the Drone around the z-axis by the specifed amount.
+ @param value The amount by which the drone is to be rotated.
+ */
+ inline void rotateRoll(float value)
+ { this->rotateRoll(Vector2(value, 0)); }
+
+ /**
+ @brief Sets the primary thrust to the input amount.
+ @param thrust The amount of thrust.
+ */
+ inline void setPrimaryThrust( float thrust )
+ { this->primaryThrust_=thrust; }
+ // place your set-functions here.
+ // - hint: auxiliary thrust, rotation thrust.
+ inline void setAuxilaryThrust( float thrust )
+ { this->primaryThrust_=thrust; }
+ inline void setRotationThrust( float thrust )
+ { this->rotationThrust_=thrust; }
+ /**
+ @brief Gets the primary thrust to the input amount.
+ @preturn The amount of thrust.
+ */
+ inline float getPrimaryThrust()
+ { return this->primaryThrust_; }
+ // place your get-functions here.
+ inline float getAuxilaryThrust()
+ { return this->auxilaryThrust_; }
+ inline float getRotationThrust()
+ { return this->rotationThrust_; }
+ private:
+ DroneController *myController_; //!< The controller of the Drone.
+
+ btVector3 localLinearAcceleration_; //!< The linear acceleration that is used to move the Drone the next tick.
+ btVector3 localAngularAcceleration_; //!< The linear angular acceleration that is used to move the Drone the next tick.
+ float primaryThrust_; //!< The amount of primary thrust. This is just used, when moving forward.
+ float auxilaryThrust_; //!< The amount of auxilary thrust. Used for all other movements (except for rotations).
+ float rotationThrust_; //!< The amount of rotation thrust. Used for rotations only.
+ };
+
+}
+
+#endif /* _Drone_H__ */
Added: code/branches/rocket/src/orxonox/worldentities/RocketDrone.cc
===================================================================
--- code/branches/rocket/src/orxonox/worldentities/RocketDrone.cc (rev 0)
+++ code/branches/rocket/src/orxonox/worldentities/RocketDrone.cc 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,192 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oli Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "RocketDrone.h"
+
+#include "core/XMLPort.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "graphics/Model.h"
+
+namespace orxonox
+{
+ CreateFactory(RocketDrone);
+ // put your code in here:
+ // create the factory for the drone
+
+ /**
+ @brief
+ Constructor. Registers the object and initializes some default values.
+ */
+ RocketDrone::RocketDrone(BaseObject* creator) : ControllableEntity(creator)
+ {
+ RegisterObject(RocketDrone);
+ // put your code in here:
+ // - register the drone class to the core
+ this->myController_ = 0;
+ this->localLinearAcceleration_.setValue(0, 0, 0);
+ this->localAngularAcceleration_.setValue(0, 0, 0);
+ this->primaryThrust_ = 100;
+ this->auxilaryThrust_ = 100;
+ this->rotationThrust_ = 10;
+ Model *model = new Model(this);
+ model->setMeshSource("rocket.mesh");
+ model->scale(0.7f);
+ this->setCollisionType(WorldEntity::Dynamic);
+
+ myController_ = new RocketController(static_cast<BaseObject*>(this)); //!< Creates a new controller and passes our this pointer to it as creator.
+ }
+
+ /**
+ @brief
+ Destructor. Destroys controller, if present.
+ */
+ RocketDrone::~RocketDrone()
+ {
+ if( this->isInitialized() && this->myController_ )
+ delete this->myController_;
+ }
+
+ /**
+ @brief
+ Method for creating a Drone through XML.
+ */
+ void RocketDrone::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+ {
+ // this calls the XMLPort function of the parent class
+ SUPER(RocketDrone, XMLPort, xmlelement, mode);
+
+ // put your code in here:
+ // make sure you add the variables primaryThrust_, auxilaryThrust_ and rotationThrust_ to xmlport
+ // make sure that the set- and get-functions exist.
+ // variables can be added by the following command
+ // XMLPortParam(Classname, "xml-attribute-name (i.e. variablename)", setFunction, getFunction, xmlelement, mode)
+ XMLPortParam(RocketDrone, "primaryThrust_", setPrimaryThrust, getPrimaryThrust, xmlelement, mode);
+ XMLPortParam(RocketDrone, "auxilaryThrust_", setAuxilaryThrust, getAuxilaryThrust, xmlelement, mode);
+ XMLPortParam(RocketDrone, "rotationThrust_", setRotationThrust, getRotationThrust, xmlelement, mode);
+
+ }
+
+ /**
+ @brief
+ Defines which actions the Drone has to take in each tick.
+ @param dt
+ The length of the tick.
+ */
+ void RocketDrone::tick(float dt)
+ {
+ SUPER(RocketDrone, tick, dt);
+
+ //if (this->hasLocalController())
+ //{
+ this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() * getMass() * this->auxilaryThrust_);
+ this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() * getMass() * this->auxilaryThrust_);
+ if (this->localLinearAcceleration_.z() > 0)
+ this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->auxilaryThrust_);
+ else
+ this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() * getMass() * this->primaryThrust_);
+ this->physicalBody_->applyCentralForce(physicalBody_->getWorldTransform().getBasis() * this->localLinearAcceleration_);
+ this->localLinearAcceleration_.setValue(0, 0, 0);
+
+ this->localAngularAcceleration_ *= this->getLocalInertia() * this->rotationThrust_;
+ this->physicalBody_->applyTorque(physicalBody_->getWorldTransform().getBasis() * this->localAngularAcceleration_);
+ this->localAngularAcceleration_.setValue(0, 0, 0);
+ //}
+ }
+
+ /**
+ @brief
+ Moves the Drone in the negative z-direction (Front/Back) by an amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the movement.
+ */
+ void RocketDrone::moveFrontBack(const Vector2& value)
+ {
+ this->localLinearAcceleration_.setZ(this->localLinearAcceleration_.z() - value.x);
+ }
+
+ /**
+ @brief
+ Moves the Drone in the x-direction (Right/Left) by an amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the movement.
+ */
+ void RocketDrone::moveRightLeft(const Vector2& value)
+ {
+ this->localLinearAcceleration_.setX(this->localLinearAcceleration_.x() + value.x);
+ }
+
+ /**
+ @brief
+ Moves the Drone in the y-direction (Up/Down) by an amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the movement.
+ */
+ void RocketDrone::moveUpDown(const Vector2& value)
+ {
+ this->localLinearAcceleration_.setY(this->localLinearAcceleration_.y() + value.x);
+ }
+
+ /**
+ @brief
+ Rotates the Drone around the y-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void RocketDrone::rotateYaw(const Vector2& value)
+ {
+ this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x);
+ }
+
+ /**
+ @brief
+ Rotates the Drone around the x-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void RocketDrone::rotatePitch(const Vector2& value)
+ {
+ this->localAngularAcceleration_.setX(this->localAngularAcceleration_.x() + value.x);
+ }
+
+ /**
+ @brief
+ Rotates the Drone around the z-axis by the amount specified by the first component of the input 2-dim vector.
+ @param value
+ The vector determining the amount of the angular movement.
+ */
+ void RocketDrone::rotateRoll(const Vector2& value)
+ {
+ this->localAngularAcceleration_.setZ(this->localAngularAcceleration_.z() + value.x);
+ }
+
+ //void RocketDrone::setOwner(Pawn* owner)
+ //{
+ // this->owner_ = owner;
+ //}
+
+}
Added: code/branches/rocket/src/orxonox/worldentities/RocketDrone.h
===================================================================
--- code/branches/rocket/src/orxonox/worldentities/RocketDrone.h (rev 0)
+++ code/branches/rocket/src/orxonox/worldentities/RocketDrone.h 2010-04-26 13:40:16 UTC (rev 6778)
@@ -0,0 +1,139 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Oli Scheuss
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _RocketDrone_H__
+#define _RocketDrone_H__
+
+#include "OrxonoxPrereqs.h"
+#include "worldentities/ControllableEntity.h"
+#include "controllers/RocketController.h"
+
+namespace orxonox
+{
+
+ /**
+ @brief
+ Drone, that is made to move upon a specified pattern.
+ This class was constructed for the PPS tutorial.
+ @author
+ Oli Scheuss
+ */
+ class _OrxonoxExport RocketDrone : public ControllableEntity
+ {
+ public:
+ RocketDrone(BaseObject* creator);
+ virtual ~RocketDrone();
+
+ virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Drone through XML.
+ virtual void tick(float dt); //!< Defines which actions the Drone has to take in each tick.
+
+
+ virtual void moveFrontBack(const Vector2& value);
+ virtual void moveRightLeft(const Vector2& value);
+ virtual void moveUpDown(const Vector2& value);
+
+ virtual void rotateYaw(const Vector2& value);
+ virtual void rotatePitch(const Vector2& value);
+ virtual void rotateRoll(const Vector2& value);
+
+ /**
+ @brief Moves the Drone in the Front/Back-direction by the specifed amount.
+ @param value The amount by which the drone is to be moved.
+ */
+ inline void moveFrontBack(float value)
+ { this->moveFrontBack(Vector2(value, 0)); }
+ /**
+ @brief Moves the Drone in the Right/Left-direction by the specifed amount.
+ @param value The amount by which the drone is to be moved.
+ */
+ inline void moveRightLeft(float value)
+ { this->moveRightLeft(Vector2(value, 0)); }
+ /**
+ @brief Moves the Drone in the Up/Down-direction by the specifed amount.
+ @param value The amount by which the drone is to be moved.
+ */
+ inline void moveUpDown(float value)
+ { this->moveUpDown(Vector2(value, 0)); }
+
+ /**
+ @brief Rotates the Drone around the y-axis by the specifed amount.
+ @param value The amount by which the drone is to be rotated.
+ */
+ inline void rotateYaw(float value)
+ { this->rotateYaw(Vector2(value, 0)); }
+ /**
+ @brief Rotates the Drone around the x-axis by the specifed amount.
+ @param value The amount by which the drone is to be rotated.
+ */
+ inline void rotatePitch(float value)
+ { this->rotatePitch(Vector2(value, 0)); }
+ /**
+ @brief Rotates the Drone around the z-axis by the specifed amount.
+ @param value The amount by which the drone is to be rotated.
+ */
+ inline void rotateRoll(float value)
+ { this->rotateRoll(Vector2(value, 0)); }
+
+ /**
+ @brief Sets the primary thrust to the input amount.
+ @param thrust The amount of thrust.
+ */
+ inline void setPrimaryThrust( float thrust )
+ { this->primaryThrust_=thrust; }
+ // place your set-functions here.
+ // - hint: auxiliary thrust, rotation thrust.
+ inline void setAuxilaryThrust( float thrust )
+ { this->primaryThrust_=thrust; }
+ inline void setRotationThrust( float thrust )
+ { this->rotationThrust_=thrust; }
+ /**
+ @brief Gets the primary thrust to the input amount.
+ @preturn The amount of thrust.
+ */
+ inline float getPrimaryThrust()
+ { return this->primaryThrust_; }
+ // place your get-functions here.
+ inline float getAuxilaryThrust()
+ { return this->auxilaryThrust_; }
+ inline float getRotationThrust()
+ { return this->rotationThrust_; }
+
+ //void setOwner(Pawn* owner);
+ private:
+ RocketController *myController_; //!< The controller of the Drone.
+
+ btVector3 localLinearAcceleration_; //!< The linear acceleration that is used to move the Drone the next tick.
+ btVector3 localAngularAcceleration_; //!< The linear angular acceleration that is used to move the Drone the next tick.
+ float primaryThrust_; //!< The amount of primary thrust. This is just used, when moving forward.
+ float auxilaryThrust_; //!< The amount of auxilary thrust. Used for all other movements (except for rotations).
+ float rotationThrust_; //!< The amount of rotation thrust. Used for rotations only.
+ };
+
+}
+
+#endif /* _RocketDrone_H__ */
More information about the Orxonox-commit
mailing list