Changeset 10689 in orxonox.OLD for branches/adm/src/world_entities/npcs/adm_turret.cc

Timestamp:

Jun 13, 2007, 5:51:40 PM (17 years ago)

Author:

retolu

Message:

first shooting of the turret

File:

• branches/adm/src/world_entities/npcs/adm_turret.cc (modified) (6 diffs)

branches/adm/src/world_entities/npcs/adm_turret.cc

@@ -139 +139 @@
         this->bFire = false;
         this->playerVisible = false;
+
+        
 }
 
@@ -151 +153 @@
 
 
-  Vector playerPos = this->myTarget->getAbsCoor();
+  Vector playerPos = this->myTarget->getAbsCoor() + Vector(0, 12, 0);
   Vector ds = playerPos - ( this->cannons->getAbsCoor() );
-  if ( isActive && ds.len() <= range )
+  if ( isActive && ds.len() <= range && playerVisible )
+  {
     this->moveTowards( ds,  dt);
+
+  //if target within +/- 2.5 degrees of aim -> fire
+  Vector dv1 = ds;
+  dv1.normalize();
+  Vector dv2 = this->cannons->getAbsDir().apply( Vector(-1, 0, 0));
+  dv2.normalize();
+  float angle = dv1.dot(dv2);
+  if (angle > 0.999)
+        {
+        this->fire();
+        }
+  }
   else
     this->moveTowards( Vector(0, -1, 0), dt );
@@ -212 +227 @@
 }
 
-bool AdmTurret::isVisible(const WorldEntity myTarget)
-{
-return true;
-}
-
-float AdmTurret::aim(const WorldEntity Target)
-{
-return 0;
-}
-
 void AdmTurret::fire()
 {
-        // Projectile* pj =  this->getProjectile();
-        // if (pj == NULL) return;
-
-        //pj->setOwner(this->getOwner());
-        //pj->setParent(PNode::getNullParent());
-        //pj->setVelocity(this->getAbsDir().apply(Vector( , , )) );
-        //pj->setAbsCoor(this->getEmissionPoint());
-        //pj->setAbsDir(this->getAbsDir());
-        //pj->activate();
 }
 
@@ -245 +241 @@
         
         this->cannons->toList( getOMListNumber() );
+
+        this->weapon = new BspWeapon();
+        this->weapon->setParent( this->cannons );
+        this->weapon->toList( getOMListNumber() );
+        this->weapon->setAbsCoor( this->cannons->getAbsCoor() );
+        this->weapon->setAbsDir( this->weapon->getAbsDir() * Quaternion( PI, Vector(0, 1, 0) ) );
 }
 
@@ -257 +259 @@
         this->sensor->toList( getOMListNumber() );
 }
-
 
 void AdmTurret::moveTowards( Vector targetDir, float dt )
@@ -336 +337 @@
   Vector dir = this->myTarget->getAbsCoor() - pos;
 
+
   this->playerVisible = true;
   for( ObjectList<BspEntity>::const_iterator bspIterator = BspEntity::objectList().begin();