Changeset 10132 in orxonox.OLD for branches/playability/src/world_entities/projectiles/swarm_projectile.cc

Timestamp:

Dec 20, 2006, 5:36:18 PM (17 years ago)

Author:

marcscha

Message:

Firing Echo fix on WM

File:

• branches/playability/src/world_entities/projectiles/swarm_projectile.cc (modified) (4 diffs)

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

@@ -55 +55 @@
   this->emitter->setSpread(M_PI, M_PI);
 
-  this->turningSpeed = 30;
+  this->turningSpeed = 10;
 
   this->physDamage = 200;
@@ -164 +164 @@
 //   printf("turning angle: %f\ntemp: %f\n", angle, tmp);
 
-  if( fabsf(angle) >  fabsf(tmp) ) { angle = tmp; }
+  if( fabsf(angle) >  fabsf(tmp) ) 
+    angle = tmp;
+  else
+    angle *= tmp/fabsf(tmp);
 
   Vector d = curDirection.cross(estTargetDir).cross(curDirection);
   d.normalize();
-  if( unlikely( angle == 90)) { return d; } //avoid complication
+  if( unlikely( fabsf(angle) == 90)) { return d; } //avoid complication
 
   Vector newDir = curDirection + d *  curDirection.len() * tan (angle);
@@ -221 +224 @@
 //     else
 //       tti = (this->getAbsCoor() - this->target->getAbsCoor()).len() / sqrt ( projectileVelocity * projectileVelocity + targetVelocity * targetVelocity);
-    Vector estTargetDir = (this->target->getAbsCoor() - this->getAbsCoor());
+    Vector estTargetDir = (this->target->getAbsCoor() - this->getAbsCoor()).getNormalized();
 //     estTargetDir.slerpTo(this->velocity, 1);
     this->velocity = this->newDirection(this->velocity, estTargetDir, this->turningSpeed * time );
@@ -275 +278 @@
   glPushMatrix();
 
-  Vector tmpDir = this->curDir *.7 + this->lastDir * .3;
+  Vector tmpDir = this->curDir; // *.7 + this->lastDir * .3;
+  tmpDir.slerpTo(this->lastDir, .4);
 
   float matrix[4][4];