Changeset 10035 in orxonox.OLD for branches/playability/src/world_entities/projectiles/projectile.cc

Timestamp:

Dec 9, 2006, 7:00:44 PM (17 years ago)

Author:

nicolasc

Message:

updated swarm_projectile, model included in data
TE2 tests

File:

• branches/playability/src/world_entities/projectiles/projectile.cc (modified) (2 diffs)

branches/playability/src/world_entities/projectiles/projectile.cc

@@ -167 +167 @@
  *  @return normalized (new) direction vector
 */
-Vector Projectile::newDirection(Vector curDirection, Vector estTargetDir, float angle)
-{
-  float tmp = angleDeg ( curDirection, estTargetDir);
-  if (tmp == 0) { return curDirection; }
-
-  if( angle >  tmp ) { angle = tmp; }
-
-  //Vector n = curDirection.cross(estTargetDir);
-  //Vector d = n.cross(curDirection);
-  Vector d = curDirection.cross(estTargetDir).cross(curDirection);
-  d.normalize();
-  if( angle == 90) { return d; }
-
-  Vector newDir = curDirection + d *  curDirection.len() * tan (angle);
-  newDir.normalize();
-  return newDir;
-}
+// Vector Projectile::newDirection(Vector curDirection, Vector estTargetDir, float angle)
+// {
+//   float tmp = angleDeg ( curDirection, estTargetDir);
+//   if ( unlikely(tmp == 0) ) { return curDirection; }
+// 
+//   if( fabsf(angle) >  fabsf(tmp) ) { angle = tmp; }
+// 
+//   Vector d = curDirection.cross(estTargetDir).cross(curDirection);
+//   d.normalize();
+//   if( unlikely( angle == 90)) { return d; }
+// 
+//   Vector newDir = curDirection + d *  curDirection.len() * tan (angle);
+//   newDir.normalize();
+//   return newDir;
+// }
 
 
@@ -192 +190 @@
 void Projectile::tick (float dt)
 {
-  float tti = 0;  //!< time to impact
-  Vector estTargetDir = (this->target->getRelCoor() + this->target->getVelocity());
-  this->velocity = this->newDirection(this->velocity, estTargetDir, this->turningSpeed * dt ) * this->velocity.len();
-  Vector v = this->velocity * (dt);
-  this->shiftCoor(v);
+/*
+  if (target != NULL){
+    float tti = this->target->getRelCoor().len() / this->getVelocity().len();
+    Vector estTargetDir = (this->target->getRelCoor() + this->target->getVelocity()) * tti;
+    this->velocity = this->newDirection(this->velocity, estTargetDir, this->turningSpeed * dt ) * this->velocity.len();
+    Vector v = this->velocity * (dt);
+    this->shiftCoor(v);
+  }*/
 
   if (this->tickLifeCycle(dt))