Changeset 6614 in orxonox.OLD

Timestamp:

Jan 19, 2006, 8:01:08 AM (18 years ago)

Author:

snellen

Message:

aim.cc updated

Location:

branches/spaceshipcontrol/src/world_entities/weapons

Files:

• aim.cc (modified) (6 diffs)
• aim.h (modified) (2 diffs)
• aiming_turret.cc (modified) (3 diffs)
• targeting_turret.cc (modified) (2 diffs)

branches/spaceshipcontrol/src/world_entities/weapons/aim.cc

@@ -73 +73 @@
   this->source = NULL;
 
+  this->range = 0;
+  this->angle = 0;
   this->anim = new tAnimation<Aim>(this, &Aim::setSize);
   this->anim->setInfinity(ANIM_INF_CONSTANT);
@@ -101 +103 @@
 }
 
-void Aim::searchTarget(float range, float angle)
+void Aim::searchTarget()
 {
   std::list<WorldEntity*>::iterator entity;
@@ -107 +109 @@
   diffVec = ( this->getAbsCoor() - this->source->getAbsCoor() );
 
-//only look for target if the aim hasn`t locked a target yet or if the actual target is out of range 
-  if( this == PNode::getNullParent() || diffVec.len() > range  || ( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle && (this->source->getAbsDirX()).dot(diffVec) > 0))
+//only look for target if the aim hasn`t locked a target yet or if the actual target is out of range
+  if( this == PNode::getNullParent() || diffVec.len() > range  || ( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle))
   for (entity = State::getObjectManager()->getObjectList(OM_GROUP_00).begin();
        entity != State::getObjectManager()->getObjectList(OM_GROUP_00).end();
@@ -115 +117 @@
     diffVec = ( (*entity)->getAbsCoor() - this->source->getAbsCoor() );
 
-    if ( diffVec.len() < range  &&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) < angle && (this->source->getAbsDirX()).dot(diffVec) > 0)
+    if ( diffVec.len() < range  &&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) < angle)
     {
       if (this->getParent() != (*entity))
@@ -130 +132 @@
 
 
-
 /**
  * @brief sets the size of the Aim.
@@ -164 +165 @@
 
 //  if (this->source->getAbsCoor().x > this->getAbsCoor().x )
-//    this->searchTarget(1000,M_PI_2);
+     this->searchTarget();
 //   float z = 0.0f;
 //   glReadPixels ((int)this->getAbsCoor2D().x,

branches/spaceshipcontrol/src/world_entities/weapons/aim.h

@@ -38 +38 @@
   inline PNode* getTarget(PNode* target) { return this->getParent(); };
 
-  void searchTarget(float range, float angle);
+  void searchTarget();
+
+  void setRange(float range){this->range = range;};
+  void setAngle(float angle){this->angle = angle;};
 
   void setSize(float size);
@@ -53 +56 @@
    tAnimation<Aim>* anim;
 
+   float            range;                //!<
+   float            angle;                //!<
+
    PNode*           source;               //!< Where this Shot has come from.
 

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

@@ -98 +98 @@
   this->target = new Aim(this);
   this->target->setVisibility(false);
+  this->target->setRange(100);
+  this->target->setAngle(M_PI);
 }
 
@@ -130 +132 @@
   this->setAbsDirSoft(quat, 5);
 
-  this->target->searchTarget(100,M_PI_2);
+  this->target->tick(dt);
 }
 
@@ -146 +148 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
-  this->target->searchTarget(100,M_PI_2);
+  this->target->searchTarget();
 }
 

branches/spaceshipcontrol/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;
@@ -150 +152 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
-  this->target->searchTarget(100,M_PI_2);
+  this->target->searchTarget();
 }