Changeset 5559 in orxonox.OLD for branches/world_entities/src/world_entities/weapons/aiming_turret.cc

Timestamp:

Nov 13, 2005, 4:30:07 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: simple-aiming function, with visible targetting-system

File:

• branches/world_entities/src/world_entities/weapons/aiming_turret.cc (modified) (8 diffs)

branches/world_entities/src/world_entities/weapons/aiming_turret.cc

@@ -18 +18 @@
 
 #include "weapon_manager.h"
+#include "aim.h"
 #include "projectile.h"
 
@@ -45 +46 @@
   this->init();
 
-  this->loadModel("models/guns/turret1.obj");
+  this->loadModel("models/guns/turret2.obj");
 
 
@@ -66 +67 @@
 {
   // model will be deleted from WorldEntity-destructor
+  delete this->target;
 }
 
@@ -99 +101 @@
   //this->getProjectileFactory()->prepare(100);
 
-  this->target = NULL;
+  this->target = new Aim();
 }
 
@@ -119 +121 @@
 {
   Quaternion quat;
-  if (this->target == NULL)
-    this->target = this->getWeaponManager()->getDistanceTarget(this, 50);
   Vector direction = this->target->getAbsCoor() - this->getAbsCoor();
 
@@ -130 +130 @@
     quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
 
-  this->setAbsDirSoft(quat, 20);
+  this->setAbsDirSoft(quat, 5);
+
+  this->target->tick(dt);
 }
 
@@ -143 +145 @@
   if (target != NULL)
   {
-    pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
+    pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
   }
@@ -153 +155 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
-  this->target = this->getWeaponManager()->getDistanceTarget(this, 50);
+  this->target->searchTarget(this);
 }