Changeset 161 for code/branches/main_reto_vs05/src/orxonox_ship.cc

Timestamp:

Nov 4, 2007, 5:00:41 PM (16 years ago)

Author:

rgrieder

Message:

• added namespace Orxonox to every file
  • removed all the "using namespace Ogre" in the header files
• cleaned up with the includes: attempt to include as little as possible to reduce compile time.
  • created a header file: orxonox_prerequisites.h
  • used OgrePrerequisites in the header files
  • avoided including "Ogre.h", using separate files instead
• created empty class: AmmunitionDump

File:

• code/branches/main_reto_vs05/src/orxonox_ship.cc (modified) (1 diff)

code/branches/main_reto_vs05/src/orxonox_ship.cc

@@ -26 +26 @@
  */
 
-/**
-* Base class for any kind of flyable ship in Orxonox.
-* 
-* The ship offers steering methods (like left, right, etc.) and translates
-* them into movement. A ship can also hold more than one weapons (where each
-* of these can be replaced during the game). This means that a ship can have
-* many WeaponManagers but only one MunitionManager (independant object that
-* is referenced in each WeaponManager).
-* Furthermore a ship in Orxonox is responsible for its visualization, which is
-* why it receives a pointer to the SceneManager.
-*/
-
+#include "OgreSceneManager.h"
+#include "OgreSceneNode.h"
+#include "OgreEntity.h"
+#include "OgreVector3.h"
+#include "OgreStringConverter.h"
+
+#include "bullet.h"
 
 #include "orxonox_ship.h"
 
-
-/**
-* Standard constructor, that only initalizes a few variables. Some of them
-* could be made static, since any new ship would be derived from the BaseShip.
-* Or even better: write config files for each ship so that manipulating
-* its properties would be even easier.
-* @param mSceneMgr The current main SceneManager
-* @param mNode The scene node which the ship will be attached to later.
-*/
-OrxonoxShip::OrxonoxShip(SceneManager *sceneMgr, SceneNode *node)
-            : sceneMgr_(sceneMgr), rootNode_(node), currentSpeed_(Vector3(0, 0, 0)),
-      baseThrust_(1000), currentThrust_(Vector3::ZERO),
-      objectCounter_(0), bulletSpeed_(400)
-{
+namespace Orxonox {
+  using namespace Ogre;
+
+  /**
+  * Base class for any kind of flyable ship in Orxonox.
+  * 
+  * The ship offers steering methods (like left, right, etc.) and translates
+  * them into movement. A ship can also hold more than one weapons (where each
+  * of these can be replaced during the game). This means that a ship can have
+  * many WeaponManagers but only one MunitionManager (independant object that
+  * is referenced in each WeaponManager).
+  * Furthermore a ship in Orxonox is responsible for its visualization, which is
+  * why it receives a pointer to the SceneManager.
+  */
+
+
+
+
+  /**
+  * Standard constructor, that only initalizes a few variables. Some of them
+  * could be made static, since any new ship would be derived from the BaseShip.
+  * Or even better: write config files for each ship so that manipulating
+  * its properties would be even easier.
+  * @param mSceneMgr The current main SceneManager
+  * @param mNode The scene node which the ship will be attached to later.
+  */
+  OrxonoxShip::OrxonoxShip(SceneManager *sceneMgr, SceneNode *node)
+              : sceneMgr_(sceneMgr), rootNode_(node), currentSpeed_(Vector3(0, 0, 0)),
+        baseThrust_(1000), currentThrust_(Vector3::ZERO),
+        objectCounter_(0), bulletSpeed_(400)
+  {
+  }
+
+
+  /**
+  * Standard destructor.
+  * Doesn't have any work to do yet.
+  */
+  OrxonoxShip::~OrxonoxShip()
+  {
+  }
+
+
+  /**
+  * Initialises everything.
+  * Once that ResourceGroups are organised, this method loads them.
+  * It might be an idea to make this function static in order for the
+  * SceneManger to call the initialise method of every needed class (macros..)
+  * @return Returns false when failed.
+  */
+  bool OrxonoxShip::initialise()
+  {
+          // load all the resources needed (no resource groups yet,
+    // so the allInit is not executed!)
+          // ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
+
+          // create the "space ship" (currently a fish..)
+          // TODO: names must be unique! use static variables..
+          shipEntity_ = sceneMgr_->createEntity("Ship", "fish.mesh");
+          SceneNode *fishNode = rootNode_->createChildSceneNode("fishNode");
+          fishNode->yaw(Degree(-90));
+          fishNode->attachObject(shipEntity_);
+          fishNode->setScale(Vector3(10, 10, 10));
+
+          return true;
+  }
+
+
+  /**
+  * Gets the ship to accelerate in the current direction.
+  * The value should be between 0 and 1, with one beeing full thrust and 0 none.
+  * @param value Acceleration between 0 and 1
+  */
+  void OrxonoxShip::setMainThrust(const Real value)
+  {
+          //currentThrust_ = value * baseThrust_;
+    currentThrust_.z = value * baseThrust_;
+  }
+
+
+  /**
+  * Gets the ship to accelerate sideways regarding the current direction.
+  * The value should be between 0 and 1, with one beeing full thrust and 0 none.
+  * @param value Acceleration between 0 and 1
+  */
+  void OrxonoxShip::setSideThrust(const Real value)
+  {
+          //currentSideThrust_ = value * baseThrust_;
+    currentThrust_.x = value * baseThrust_;
+  }
+
+
+  /**
+  * Gets the ship to accelerate up and down.
+  * The value should be between 0 and 1, with one beeing full thrust and 0 none.
+  * @param value Acceleration between 0 and 1
+  */
+  void OrxonoxShip::setYThrust(const Real value)
+  {
+    //currentYThrust_ = value * baseThrust_;
+    currentThrust_.y = value * baseThrust_;
+  }
+
+
+  /**
+  * Rotate the ship along with the camera up and down.
+  * @param angle Pitch value.
+  */
+  void OrxonoxShip::turnUpAndDown(const Radian &angle)
+  {
+    rootNode_->pitch(-angle, Node::TS_LOCAL);
+  }
+
+
+  /**
+  * Rotate the ship along with the camera left and right.
+  * @param angle Yaw value.
+  */
+  void OrxonoxShip::turnLeftAndRight(const Radian &angle)
+  {
+    rootNode_->yaw(-angle, Node::TS_PARENT);
+  }
+
+
+  /**
+  * Returns the current speed of the ship according to its parent node.
+  * @return The current speed.
+  */
+  Vector3 OrxonoxShip::getSpeed()
+  {
+    return currentSpeed_;
+  }
+
+  /**
+  * Returns the ship's root SceneNode.
+  * @return The Root Node.
+  */
+  SceneNode* OrxonoxShip::getRootNode()
+  {
+    return rootNode_;
+  }
+
+
+  /**
+  * Fire a bullet (Entity with SceneNode).
+  * This method creates a new Entity plus a SceneNode. But be sure not make
+  * the new Node a child of RootNode_!
+  * @return Bullet containing speed and entity.
+  */
+  Bullet* OrxonoxShip::fire()
+  {
+          // TODO: Names must be unique!
+          SceneNode *temp = rootNode_->getParentSceneNode()->createChildSceneNode(
+          "BulletNode" + StringConverter::toString(objectCounter_));
+          temp->setOrientation(rootNode_->getOrientation());
+          temp->setPosition(rootNode_->getPosition());
+          temp->setScale(Vector3(1, 1, 1) * 10);
+          temp->yaw(Degree(-90));
+          return new Bullet(temp, sceneMgr_->createEntity("bullet"
+          + StringConverter::toString(objectCounter_++), "Barrel.mesh"), currentSpeed_
+          + (rootNode_->getOrientation() * Vector3(0, 0, -1)).normalisedCopy()
+          * bulletSpeed_);
+  }
+
+
+  /**
+  * Standard tick() function.
+  * Currently, only the speed is applied according to the thrust values.
+  * @param time Absolute time.
+  * @param deltaTime Relative time.
+  * @return Return true to continue render
+  */
+  bool OrxonoxShip::tick(unsigned long time, Real deltaTime)
+  {
+    Quaternion quad = rootNode_->getOrientation();
+    quad.normalise();
+    currentSpeed_ += quad * (Vector3(-1, -1, -1) * currentThrust_) * deltaTime;
+    //currentSpeed_ += quad * Vector3(0, 0, -1) * currentThrust_ * deltaTime;
+          //currentSpeed_ += quad * Vector3(-1, 0,  0) * currentSideThrust_ * deltaTime;
+
+          rootNode_->translate(currentSpeed_ * deltaTime);
+
+          return true;
+  }
+
 }
-
-
-/**
-* Standard destructor.
-* Doesn't have any work to do yet.
-*/
-OrxonoxShip::~OrxonoxShip()
-{
-}
-
-
-/**
-* Initialises everything.
-* Once that ResourceGroups are organised, this method loads them.
-* It might be an idea to make this function static in order for the
-* SceneManger to call the initialise method of every needed class (macros..)
-* @return Returns false when failed.
-*/
-bool OrxonoxShip::initialise()
-{
-        // load all the resources needed (no resource groups yet,
-  // so the allInit is not executed!)
-        // ResourceGroupManager::getSingleton().initialiseAllResourceGroups();
-
-        // create the "space ship" (currently a fish..)
-        // TODO: names must be unique! use static variables..
-        shipEntity_ = sceneMgr_->createEntity("Ship", "fish.mesh");
-        SceneNode *fishNode = rootNode_->createChildSceneNode("fishNode");
-        fishNode->yaw(Degree(-90));
-        fishNode->attachObject(shipEntity_);
-        fishNode->setScale(Vector3(10, 10, 10));
-
-        return true;
-}
-
-
-/**
-* Gets the ship to accelerate in the current direction.
-* The value should be between 0 and 1, with one beeing full thrust and 0 none.
-* @param value Acceleration between 0 and 1
-*/
-void OrxonoxShip::setMainThrust(const Real value)
-{
-        //currentThrust_ = value * baseThrust_;
-  currentThrust_.z = value * baseThrust_;
-}
-
-
-/**
-* Gets the ship to accelerate sideways regarding the current direction.
-* The value should be between 0 and 1, with one beeing full thrust and 0 none.
-* @param value Acceleration between 0 and 1
-*/
-void OrxonoxShip::setSideThrust(const Real value)
-{
-        //currentSideThrust_ = value * baseThrust_;
-  currentThrust_.x = value * baseThrust_;
-}
-
-
-/**
-* Gets the ship to accelerate up and down.
-* The value should be between 0 and 1, with one beeing full thrust and 0 none.
-* @param value Acceleration between 0 and 1
-*/
-void OrxonoxShip::setYThrust(const Real value)
-{
-  //currentYThrust_ = value * baseThrust_;
-  currentThrust_.y = value * baseThrust_;
-}
-
-
-/**
-* Rotate the ship along with the camera up and down.
-* @param angle Pitch value.
-*/
-void OrxonoxShip::turnUpAndDown(const Radian &angle)
-{
-  rootNode_->pitch(-angle, Node::TS_LOCAL);
-}
-
-
-/**
-* Rotate the ship along with the camera left and right.
-* @param angle Yaw value.
-*/
-void OrxonoxShip::turnLeftAndRight(const Radian &angle)
-{
-  rootNode_->yaw(-angle, Node::TS_PARENT);
-}
-
-
-/**
-* Returns the current speed of the ship according to its parent node.
-* @return The current speed.
-*/
-Vector3 OrxonoxShip::getSpeed()
-{
-  return currentSpeed_;
-}
-
-/**
-* Returns the ship's root SceneNode.
-* @return The Root Node.
-*/
-SceneNode* OrxonoxShip::getRootNode()
-{
-  return rootNode_;
-}
-
-
-/**
-* Fire a bullet (Entity with SceneNode).
-* This method creates a new Entity plus a SceneNode. But be sure not make
-* the new Node a child of RootNode_!
-* @return Bullet containing speed and entity.
-*/
-Bullet* OrxonoxShip::fire()
-{
-        // TODO: Names must be unique!
-        SceneNode *temp = rootNode_->getParentSceneNode()->createChildSceneNode(
-        "BulletNode" + StringConverter::toString(objectCounter_));
-        temp->setOrientation(rootNode_->getOrientation());
-        temp->setPosition(rootNode_->getPosition());
-        temp->setScale(Vector3(1, 1, 1) * 10);
-        temp->yaw(Degree(-90));
-        return new Bullet(temp, sceneMgr_->createEntity("bullet"
-        + StringConverter::toString(objectCounter_++), "Barrel.mesh"), currentSpeed_
-        + (rootNode_->getOrientation() * Vector3(0, 0, -1)).normalisedCopy()
-        * bulletSpeed_);
-}
-
-
-/**
-* Standard tick() function.
-* Currently, only the speed is applied according to the thrust values.
-* @param time Absolute time.
-* @param deltaTime Relative time.
-* @return Return true to continue render
-*/
-bool OrxonoxShip::tick(unsigned long time, Real deltaTime)
-{
-  Quaternion quad = rootNode_->getOrientation();
-  quad.normalise();
-  currentSpeed_ += quad * (Vector3(-1, -1, -1) * currentThrust_) * deltaTime;
-  //currentSpeed_ += quad * Vector3(0, 0, -1) * currentThrust_ * deltaTime;
-        //currentSpeed_ += quad * Vector3(-1, 0,  0) * currentSideThrust_ * deltaTime;
-
-        rootNode_->translate(currentSpeed_ * deltaTime);
-
-        return true;
-}