Changeset 169 for code/branches/main_reto_vs05/src

Timestamp:

Nov 5, 2007, 8:43:21 PM (17 years ago)

Author:

rgrieder

Message:

• merged "includ" folder into the "src" folder
• started writing the weaponManager
• renamed 2 files with capital letters

Location:

code/branches/main_reto_vs05/src

Files:

• ammunition_dump.cc (modified) (1 diff)
• ammunition_dump.h (added)
• barrel_gun.cc (added)
• barrel_gun.h (added)
• bullet.cc (modified) (1 diff)
• bullet.h (added)
• camera_manager.cc (modified) (1 diff)
• camera_manager.h (added)
• main.cc (modified) (1 diff)
• ogre_control.cc (modified) (1 diff)
• ogre_control.h (added)
• orxonox.cc (modified) (1 diff)
• orxonox.h (added)
• orxonox_prerequisites.h (added)
• orxonox_scene.cc (modified) (1 diff)
• orxonox_scene.h (added)
• orxonox_ship.cc (modified) (3 diffs)
• orxonox_ship.h (added)
• run_manager.cc (modified) (3 diffs)
• run_manager.h (added)
• weapon.h (added)
• weapon_manager.cc (modified) (2 diffs)
• weapon_manager.h (added)

code/branches/main_reto_vs05/src/ammunition_dump.cc

@@ -29 +29 @@
 
 
-namespace Orxonox {
+namespace orxonox {
 
   AmmunitionDump::AmmunitionDump()

code/branches/main_reto_vs05/src/bullet.cc

@@ -33 +33 @@
 
 
-namespace Orxonox {
+namespace orxonox {
   using namespace Ogre;
 
-  Bullet::Bullet(SceneNode *mNode, Entity *mEntity, Vector3 mSpeed)
-        : mNode(mNode), mEntity(mEntity), mSpeed(mSpeed)
+  Bullet::Bullet(SceneNode *node, Entity *entity, Vector3 speed)
+    : node_(node), entity_(entity), speed_(speed)
   {
-          mNode->attachObject(mEntity);
+          node_->attachObject(entity_);
   }
 

code/branches/main_reto_vs05/src/camera_manager.cc

@@ -31 +31 @@
 #include "camera_manager.h"
 
-namespace Orxonox {
+namespace orxonox {
   using namespace Ogre;
 

code/branches/main_reto_vs05/src/main.cc

@@ -45 +45 @@
     try {
       // create an orxonox aplication and run it
-      Orxonox::Orxonox myApp;
+      orxonox::Orxonox myApp;
 
       myApp.go();

code/branches/main_reto_vs05/src/ogre_control.cc

@@ -39 +39 @@
 
 
-namespace Orxonox {
+namespace orxonox {
   using namespace Ogre;
 

code/branches/main_reto_vs05/src/orxonox.cc

@@ -41 +41 @@
 
 
-namespace Orxonox {
+namespace orxonox {
 
   /**

code/branches/main_reto_vs05/src/orxonox_scene.cc

@@ -36 +36 @@
 #include "orxonox_scene.h"
 
-namespace Orxonox {
+namespace orxonox {
   using namespace Ogre;
 

code/branches/main_reto_vs05/src/orxonox_ship.cc

@@ -35 +35 @@
 
 #include "orxonox_ship.h"
-
-namespace Orxonox {
+#include "weapon_manager.h"
+
+
+namespace orxonox {
   using namespace Ogre;
 
@@ -52 +54 @@
 
 
-
-
   /**
   * Standard constructor, that only initalizes a few variables. Some of them
@@ -99 +99 @@
           fishNode->attachObject(shipEntity_);
           fishNode->setScale(Vector3(10, 10, 10));
+
+    // initialise weapon(s)
+    SceneNode *mainWeaponNode = rootNode_->createChildSceneNode("mainWeaponNode");
+    mainWeapon_ = new WeaponManager(sceneMgr_, mainWeaponNode, 1);
 
           return true;

code/branches/main_reto_vs05/src/run_manager.cc

@@ -25 +25 @@
 */
 
-
-/**
-* RunManager is the basic control object during the game.
-* 
-* The RunManger class is designed to actually "run" the main part of the
-* game. The Idea is, that you could derive from the RunManager in order
-* to distinguish between a first person shooter or a space craft shooter.
-* RunManager loads and initialises everything in the scene (like the ship,
-* the enemies in the scene, any scripts, the physics, window events,
-* environment, HUD, etc.).
-* It also captures any input from keyboard, mous, joystick (optional) or
-* Ogre (window events).
-*/
 
 #include "Ogre.h"
@@ -69 +56 @@
 #include "run_manager.h"
 
-namespace Orxonox {
+namespace orxonox {
   using namespace Ogre;
+
+  /**
+  * RunManager is the basic control object during the game.
+  * 
+  * The RunManger class is designed to actually "run" the main part of the
+  * game. The Idea is, that you could derive from the RunManager in order
+  * to distinguish between a first person shooter or a space craft shooter.
+  * RunManager loads and initialises everything in the scene (like the ship,
+  * the enemies in the scene, any scripts, the physics, window events,
+  * environment, HUD, etc.).
+  * It also captures any input from keyboard, mous, joystick (optional) or
+  * Ogre (window events).
+  */
+
 
   /**
@@ -240 +241 @@
     for (int i = 0; i < bulletsIndex_; i++)
     {
-      bullets_[i]->mNode->translate(bullets_[i]->mSpeed*deltaTime);
-      bullets_[i]->mNode->yaw(Degree(deltaTime*100));
-      bullets_[i]->mNode->roll(Degree(deltaTime*300));
+      bullets_[i]->node_->translate(bullets_[i]->speed_*deltaTime);
+      bullets_[i]->node_->yaw(Degree(deltaTime*100));
+      bullets_[i]->node_->roll(Degree(deltaTime*300));
     }
 

code/branches/main_reto_vs05/src/weapon_manager.cc

@@ -28 +28 @@
 #include "OgreSceneManager.h"
 
+#include "weapon.h"
 #include "weapon_manager.h"
 
 
-namespace Orxonox {
+namespace orxonox {
   using namespace Ogre;
 
-  WeaponManager::WeaponManager(SceneManager *mSceneMgr)
+  Weapon** WeaponManager::weaponList_s = NULL;
+
+  WeaponManager::WeaponManager(SceneManager *sceneMgr, SceneNode *node,
+        int slotSize)
+        : sceneMgr_(sceneMgr), node_(node), slotSize_(slotSize), slotIndex_(0)
   {
-        
+        slots_ = new Weapon*[slotSize];
   }
 
@@ -42 +47 @@
   WeaponManager::~WeaponManager()
   {
+    if (slots_)
+      delete slots_;
+  }
+
+
+  bool WeaponManager::addWeapon(const Ogre::String &name)
+  {
+    if (name == weaponList_s[0]->name_)
+    {
+      // this is ugly, but for the time being, it has to fit.
+      slots_[slotIndex_++] = weaponList_s[0];
+      return true;
+    }
+    else
+      return false;
+  }
+
+
+  // static
+  bool WeaponManager::loadWeapons()
+  {
+    weaponList_s[0] = new Weapon("Barrel Gun", 10, 2);
+    return true;
+  }
+
+
+  // static
+  void WeaponManager::destroyWeapons()
+  {
+    delete weaponList_s[0];
   }