Changeset 5740 in orxonox.OLD

Timestamp:

Nov 23, 2005, 3:49:05 PM (18 years ago)

Author:

manuel

Message:

groundturret…

Location:

branches/world_entities/src/world_entities/weapons

Files:

• ground_turret.cc (modified) (3 diffs)
• ground_turret.h (modified) (2 diffs)
• turret.h (modified) (1 diff)

branches/world_entities/src/world_entities/weapons/ground_turret.cc

@@ -17 +17 @@
 #include "factory.h"
 #include "model.h"
+#include "turret.h"
 
 CREATE_FACTORY(GroundTurret, CL_GROUND_TURRET);
@@ -52 +53 @@
   this->setClassID(CL_GROUND_TURRET, "GroundTurret");
   this->loadModel("models/ground_turret.obj", 5);
-
+  left = new Turret();
+  left->setParent(this);
+  left->setRelCoor(0,10,0);
+  right = new Turret();
+  right->setParent(this);
+  right->setRelCoor(0,10,0);
 }
 
@@ -101 +107 @@
   if (model)
     model->draw();
+  //left->draw();
+  //right->draw();
   glPopMatrix();
 }

branches/world_entities/src/world_entities/weapons/ground_turret.h

@@ -8 +8 @@
 
 #include "npcs/npc.h"
+
+class Weapon;
 
 //! A Class to ...
@@ -29 +31 @@
 
  private:
-
+   Weapon *left, *right;
 };
 

branches/world_entities/src/world_entities/weapons/turret.h

@@ -12 +12 @@
   {
   public:
-    Turret (WeaponManager* weaponManager);
+    Turret (WeaponManager* weaponManager = NULL);
     Turret(const TiXmlElement* root);
     virtual ~Turret ();