Changeset 5750 in orxonox.OLD for trunk/src/world_entities/weapons/turret.cc

Timestamp:

Nov 24, 2005, 12:13:22 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the WorldEntities into the Trunk.
Merged with command:
svn merge branches/world_entities/ trunk/ -r5516:HEAD

conflics from world_entities changed in favor of branches/world_entity
all other conflict in favor of the trunk

File:

• trunk/src/world_entities/weapons/turret.cc (modified) (5 diffs)

trunk/src/world_entities/weapons/turret.cc

@@ -30 +30 @@
 #include "factory.h"
 
-CREATE_FACTORY(Turret);
+CREATE_FACTORY(Turret, CL_TURRET);
 
 using namespace std;
 
-
 /**
  *  standard constructor
-
-   creates a new weapon
-*/
-Turret::Turret (WeaponManager* weaponManager)
-  : Weapon(weaponManager)
+ *
+ * creates a new Turret
+ */
+Turret::Turret ()
+  : Weapon()
 {
   this->init();
@@ -53 +52 @@
 }
 
-
+/**
+ * creates a new Turret from a TiXmlElement
+ */
 Turret::Turret(const TiXmlElement* root)
 {
@@ -117 +118 @@
 {
   Quaternion quat;
-  Vector direction = this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();
+  Vector direction = this->getAbsCoor();/*this->getWeaponManager()->getFixedTarget()->getAbsCoor() - this->getAbsCoor();*/
 
   direction.normalize();
@@ -135 +136 @@
     return;
 
-  PNode* target = this->getWeaponManager()->getFixedTarget();
-
-  if (target != NULL)
-  {
     pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
-  }
-  else
-    pj->setVelocity(target->getVelocity());
 
   pj->setParent(NullParent::getInstance());
@@ -159 +153 @@
 void Turret::draw () const
 {
-  this->getWeaponManager()->getFixedTarget()->debugDraw(10);
-
   /* draw gun body */
   glMatrixMode(GL_MODELVIEW);