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

Timestamp:

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

Author:

rgrieder

Message:

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

File:

• code/branches/main_reto_vs05/src/orxonox_ship.cc (modified) (3 diffs)

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;