Changeset 190

Timestamp:

Nov 7, 2007, 10:03:26 PM (17 years ago)

Author:

rgrieder

Message:

added files from rev 189

Location:

code/branches/main_reto

Files:

• bin/src (added)
• bin/src/CMakeFiles (added)
• src/CMakeLists.txt (modified) (1 diff)
• src/ammunition_dump.cc (deleted)
• src/ammunition_dump.h (deleted)
• src/barrel_gun.cc (deleted)
• src/barrel_gun.h (deleted)
• src/bullet.cc (deleted)
• src/bullet.h (deleted)
• src/inertial_node.cc (added)
• src/inertial_node.h (added)
• src/main.cc (modified) (1 diff)
• src/orxonox_prerequisites.h (modified) (2 diffs)
• src/orxonox_ship.cc (modified) (13 diffs)
• src/orxonox_ship.h (modified) (3 diffs)
• src/run_manager.cc (modified) (10 diffs)
• src/run_manager.h (modified) (1 diff)
• src/weapon (added)
• src/weapon.h (deleted)
• src/weapon/CMakeLists.txt (added)
• src/weapon/ammunition_dump.cc (added)
• src/weapon/ammunition_dump.h (added)
• src/weapon/bullet.cc (added)
• src/weapon/bullet.h (added)
• src/weapon/bullet_manager.cc (added)
• src/weapon/bullet_manager.h (added)
• src/weapon/weapon.h (added)
• src/weapon/weapon_manager.cc (added)
• src/weapon/weapon_manager.h (added)
• src/weapon_manager.cc (deleted)
• src/weapon_manager.h (deleted)

code/branches/main_reto/src/CMakeLists.txt

@@ -33 +33 @@
 TARGET_LINK_LIBRARIES(../bin/main ${OGRE_LIBRARIES} ${OIS_LIBRARIES} ${CEGUI_LIBRARIES} ${CEGUI_OGRE_LIBRARIES})
 
+#add main source dir
+ADD_SUBDIRECTORY(weapon)

code/branches/main_reto/src/main.cc

@@ -44 +44 @@
   {
     try {
-      // create an orxonox aplication and run it
+      // create an orxonox application and run it
       orxonox::Orxonox myApp;
 

code/branches/main_reto/src/orxonox_prerequisites.h

@@ -32 +32 @@
 namespace orxonox {
 
-  class AmmunitionDump;
-  class Bullet;
   class CameraManager;
+  class InertialNode;
   class OgreControl;
   class Orxonox;
@@ -40 +39 @@
   class OrxonoxScene;
   class RunManager;
-  class Weapon;
-  class WeaponManager;
+
+
+  namespace weapon {
+
+    class AmmunitionDump;
+    class Bullet;
+    class BulletManager;
+    class Weapon;
+    class WeaponManager;
+
+  }
 
 }

code/branches/main_reto/src/orxonox_ship.cc

@@ -33 +33 @@
 
 #include "bullet.h"
+#include "bullet_manager.h"
+#include "inertial_node.h"
+#include "weapon_manager.h"
 
 #include "orxonox_ship.h"
-#include "weapon_manager.h"
 
 
 namespace orxonox {
   using namespace Ogre;
+  using namespace weapon;
 
   /**
@@ -62 +65 @@
   * @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)),
+  OrxonoxShip::OrxonoxShip(SceneManager *sceneMgr, SceneNode *node,
+        BulletManager *bulletManager)
+              : sceneMgr_(sceneMgr), //currentSpeed_(Vector3(0, 0, 0)),
         baseThrust_(1000), currentThrust_(Vector3::ZERO),
-        objectCounter_(0), bulletSpeed_(400)
-  {
+        objectCounter_(0), bulletManager_(bulletManager)//, bulletSpeed_(400)
+  {
+    rootNode_ = new InertialNode(node, Vector3::ZERO);
   }
 
@@ -76 +81 @@
   OrxonoxShip::~OrxonoxShip()
   {
+    if (mainWeapon_)
+      delete mainWeapon_;
+    if (rootNode_)
+      delete rootNode_;
   }
 
@@ -95 +104 @@
           // 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));
+          InertialNode *fishNode = rootNode_->createChildNode();
+    fishNode->getSceneNode()->yaw(Degree(-90));
+          fishNode->getSceneNode()->attachObject(shipEntity_);
+          fishNode->getSceneNode()->setScale(Vector3(10, 10, 10));
 
     // initialise weapon(s)
-    SceneNode *mainWeaponNode = rootNode_->createChildSceneNode("mainWeaponNode");
-    mainWeapon_ = new WeaponManager(sceneMgr_, mainWeaponNode, 1);
+    InertialNode *mainWeaponNode = rootNode_->createChildNode();
+    mainWeapon_ = new WeaponManager(sceneMgr_, mainWeaponNode,
+          bulletManager_, 1);
+    mainWeapon_->addWeapon("Barrel Gun");
 
           return true;
@@ -110 +121 @@
   /**
   * 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.
+  * 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_;
   }
@@ -122 +132 @@
   /**
   * 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.
+  * 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_;
   }
@@ -134 +143 @@
   /**
   * Gets the ship to accelerate up and down.
-  * The value should be between 0 and 1, with one beeing full thrust and 0 none.
+  * 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_;
   }
@@ -150 +158 @@
   void OrxonoxShip::turnUpAndDown(const Radian &angle)
   {
-    rootNode_->pitch(-angle, Node::TS_LOCAL);
+    rootNode_->getSceneNode()->pitch(-angle, Node::TS_LOCAL);
   }
 
@@ -160 +168 @@
   void OrxonoxShip::turnLeftAndRight(const Radian &angle)
   {
-    rootNode_->yaw(-angle, Node::TS_PARENT);
+    rootNode_->getSceneNode()->yaw(-angle, Node::TS_PARENT);
   }
 
@@ -170 +178 @@
   Vector3 OrxonoxShip::getSpeed()
   {
-    return currentSpeed_;
+    return rootNode_->getSpeed();
   }
 
@@ -177 +185 @@
   * @return The Root Node.
   */
-  SceneNode* OrxonoxShip::getRootNode()
+  InertialNode* OrxonoxShip::getRootNode()
   {
     return rootNode_;
@@ -189 +197 @@
   * @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_);
+  void OrxonoxShip::fire()
+  {
+    mainWeapon_->primaryFireRequest();
   }
 
@@ -214 +212 @@
   bool OrxonoxShip::tick(unsigned long time, Real deltaTime)
   {
-    Quaternion quad = rootNode_->getOrientation();
+    mainWeapon_->tick(time, deltaTime);
+
+    Quaternion quad = rootNode_->getSceneNode()->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);
+    rootNode_->addSpeed(quad * (Vector3(-1, -1, -1) * currentThrust_) * deltaTime);
+
+    rootNode_->getSceneNode()->translate(rootNode_->getSpeed() * deltaTime);
 
           return true;

code/branches/main_reto/src/orxonox_ship.h

@@ -40 +40 @@
   {
   public:
-          OrxonoxShip(Ogre::SceneManager*, Ogre::SceneNode*);
+    OrxonoxShip(Ogre::SceneManager*, Ogre::SceneNode*, weapon::BulletManager*);
           virtual ~OrxonoxShip();
 
@@ -51 +51 @@
           void turnLeftAndRight(const Ogre::Radian&);
 
-    Ogre::SceneNode* getRootNode();
+    InertialNode* getRootNode();
     Ogre::Vector3 getSpeed();
 
-          Bullet* fire();
+          void fire();
 
           bool tick(unsigned long, Ogre::Real);
@@ -62 +62 @@
   protected:
           Ogre::SceneManager *sceneMgr_;
-          Ogre::SceneNode *rootNode_;
+          //Ogre::SceneNode *rootNode_;
+    InertialNode *rootNode_;
           Ogre::Entity *shipEntity_;
 
-          Ogre::Vector3 currentSpeed_;  // relative to space
+          //Ogre::Vector3 currentSpeed_;  // relative to space
           Ogre::Vector3 currentThrust_; // relative to the ship
     Ogre::Real baseThrust_;
           int objectCounter_;
-          Ogre::Vector3 bulletSpeed_;
 
-    WeaponManager *mainWeapon_;
+    weapon::BulletManager *bulletManager_;
+          //Ogre::Vector3 bulletSpeed_;
+
+    weapon::WeaponManager *mainWeapon_;
   };
 

code/branches/main_reto/src/run_manager.cc

@@ -52 +52 @@
 #include "orxonox_ship.h"
 #include "bullet.h"
+#include "bullet_manager.h"
 #include "camera_manager.h"
+#include "weapon_manager.h"
+#include "inertial_node.h"
 
 #include "run_manager.h"
@@ -58 +61 @@
 namespace orxonox {
   using namespace Ogre;
+  using namespace weapon;
 
   /**
@@ -97 +101 @@
     // background scene (world objects, skybox, lights, etc.)
     backgroundScene_ = new OrxonoxScene(sceneMgr_);
+
+
+    // BULLET LIST FOR THE TEST APPLICATION
+
+    // create a bullet manager
+    bulletManager_ = new BulletManager(sceneMgr_);
+    WeaponManager::loadWeapons();
+
+    // TODO: Use STL to make life easier. But it works this way too..
+    /*bullets_ = new Bullet*[10];
+    bulletsIndex_ = 0;
+    bulletsSize_ = 10;*/
+
 
     // PLAYER SPACESHIP
@@ -114 +131 @@
     // Construct a new spaceship and give it the node
     playerShip_ = new OrxonoxShip(sceneMgr_, sceneMgr_->getRootSceneNode()
-      ->createChildSceneNode("ShipNode", Vector3(20, 20, 20)));
+      ->createChildSceneNode("ShipNode", Vector3(20, 20, 20)), bulletManager_);
 
 
@@ -140 +157 @@
 
     
-    // BULLET LIST FOR THE TEST APPLICATION
-
-    // TODO: Use STL to make life easier. But it works this way too..
-    bullets_ = new Bullet*[10];
-    bulletsIndex_ = 0;
-    bulletsSize_ = 10;
-
 
     // HUMAN INTERFACE
@@ -205 +215 @@
     if (playerShip_)
       delete playerShip_;
+    if (bulletManager_)
+      delete bulletManager_;
+
+    WeaponManager::destroyWeapons();
 
     // clean up the bullet list
-    for (int i = 0; i < bulletsIndex_; i++)
+    /*for (int i = 0; i < bulletsIndex_; i++)
       delete bullets_[i];
-    delete bullets_;
+    delete bullets_;*/
   }
 
@@ -239 +253 @@
 
     // update the bullet positions
-    for (int i = 0; i < bulletsIndex_; i++)
+    bulletManager_->tick(time, deltaTime);
+
+    /*for (int i = 0; i < bulletsIndex_; i++)
     {
       bullets_[i]->node_->translate(bullets_[i]->speed_*deltaTime);
       bullets_[i]->node_->yaw(Degree(deltaTime*100));
       bullets_[i]->node_->roll(Degree(deltaTime*300));
-    }
+    }*/
 
     // HUMAN INTERFACE
@@ -447 +463 @@
       // Prevent continuous fire for the moment.
       leftButtonDown_ = true;
+
+      playerShip_->fire();
       
       // let ship fire one shot with its only weapon (Barrels..)
-      Bullet *tempBullet = playerShip_->fire();
+      /*Bullet *tempBullet = playerShip_->fire();
 
       // resize array if neccessary (double the size then)
@@ -464 +482 @@
 
       // add the bullet to the list
-      bullets_[bulletsIndex_++] = tempBullet;
+      bullets_[bulletsIndex_++] = tempBullet;*/
 
     }
@@ -556 +574 @@
   {
     camera_ = sceneMgr_->createCamera("PlayerCam");
-    playerShip_->getRootNode()->attachObject(camera_);
+    playerShip_->getRootNode()->getSceneNode()->attachObject(camera_);
     camera_->setNearClipDistance(5);
     camera_->setPosition(Vector3(0,10,500));

code/branches/main_reto/src/run_manager.h

@@ -109 +109 @@
 
     // Bullet array
-          Bullet **bullets_;
+          /*Bullet **bullets_;
           int bulletsSize_;
-          int bulletsIndex_;
+          int bulletsIndex_;*/
+    weapon::BulletManager *bulletManager_;
 
           // previously elapsed render time