Changeset 6637 in orxonox.OLD for trunk/src/world_entities/weapons/targeting_turret.cc

Timestamp:

Jan 21, 2006, 1:27:29 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the SpaceShipControl branche back to the trunk

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/spaceshipcontrol . -r6482:HEAD

minor conflicts, and added file hover.cc/h to the Makefile.

File:

• trunk/src/world_entities/weapons/targeting_turret.cc (modified) (3 diffs)

trunk/src/world_entities/weapons/targeting_turret.cc

@@ -92 +92 @@
   this->target = new Aim(this);
   this->target->setVisibility(false);
-
+  this->target->setRange(100);
+  this->target->setAngle(M_PI_4/2);
+  this->lockedTime = 0;
+  this->neededLockTime = 2;
+  this->lockedTarget->setParent(PNode::getNullParent());
   this->loadModel("models/guns/turret2.obj");
 
@@ -119 +123 @@
 void TargetingTurret::tick(float dt)
 {
+  if( lockedTime >= neededLockTime )
+   {
+    lockedTarget = this->target->getParent();
+    lockedTime = 0;
+   }
 
   this->target->tick(dt);
+
+  if(this->target->getParent() == PNode::getNullParent())
+   lockedTime = 0;
+  else
+   lockedTime += dt;
+
 }
 
@@ -137 +152 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
-  this->target->searchTarget(100);
+  this->target->searchTarget();
 }