Changeset 6426 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jan 7, 2006, 11:17:51 PM (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 . -r6224:HEAD
small conflict in space_ship.cc fixed in favor of the control

Location:

trunk/src/world_entities/weapons

Files:

• aiming_turret.cc (modified) (2 diffs)
• guided_missile.cc (modified) (2 diffs)
• targeting_turret.cc (copied) (copied from branches/spaceshipcontrol/src/world_entities/weapons/targeting_turret.cc)
• targeting_turret.h (copied) (copied from branches/spaceshipcontrol/src/world_entities/weapons/targeting_turret.h)

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -90 +90 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);
-  this->setProjectileType(CL_GUIDED_MISSILE);
+  this->setProjectileType(CL_ROCKET);
 
 
@@ -142 +142 @@
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
 
-  pj->setTarget(this->target->getParent());
   pj->setParent(PNode::getNullParent());
   pj->setAbsCoor(this->getEmissionPoint());

trunk/src/world_entities/weapons/guided_missile.cc

@@ -44 +44 @@
   this->energyMax = 10;
   this->lifeSpan = 10.0;
-  this->agility = 4;
+  this->agility = 500;
   this->maxVelocity = 75;
 
@@ -156 +156 @@
      correctionVector = (( ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )) - velocity).getNormalized()) * agility;
 
-      if(velocity.dot(diffVector) > 0)
+      if( (diffVector *  (speed * speed/( velocity.dot(diffVector ) ) ) -velocity).len() < agility )
+       velocity = ((diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )).getNormalized())*agility;
+      else if(velocity.dot(diffVector) > 0)
         velocity += correctionVector;
       else if (velocity.dot(diffVector) < 0)