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

Timestamp:

Dec 15, 2006, 8:34:47 AM (18 years ago)

Author:

nicolasc

Message:

guiding system (somewhat not working)
minor cleanup in pnode.h
cd/cr in hbolt/lbolt

File:

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

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

@@ -28 +28 @@
 
 #include "class_id_DEPRECATED.h"
+
+#include "math/vector.h"
 
 ObjectListDefinitionID(SwarmProjectile, CL_SWARM_PROJECTILE);
@@ -54 +56 @@
 
   this->target = NULL;
-
-  this->rotationSpeed = 100;
-  this->angle = 0;
 }
 
@@ -128 +127 @@
 
   this->setHealth(10.0* (float)rand()/(float)RAND_MAX);
+
+  this->maxVelocity = 300;
+
+  this->rotationSpeed = 100;
+  this->angle = 0;
 }
 
@@ -216 +220 @@
   this->shiftCoor(v);*/
 
-  float projectileVelocity = this->velocity.len();
-  if (target != NULL){
-    float tti;  //Time To Impact
-    float targetVelocity = this->target->getVelocity().len();
-    if (unlikely(projectileVelocity == 0 && targetVelocity == 0)) // TODO calculate this reasonably
-      tti = 1; // we do have a problem....
-    else
-      tti = this->target->getRelCoor().len() / sqrt ( projectileVelocity * projectileVelocity + targetVelocity * targetVelocity);
-    Vector estTargetDir = (this->target->getRelCoor() + this->target->getVelocity()) * tti;
-    this->velocity = this->newDirection(this->velocity, estTargetDir, this->turningSpeed * time );
-  }
-  else
-    if (likely(projectileVelocity != 0))
-      this->velocity *= maxVelocity / projectileVelocity; // set speed to max
-
-
-  this->shiftCoor(velocity * time);
+//   float projectileVelocity = this->getVelocity().len();
+//   if (target != NULL){
+//     float tti;  //Time To Impact
+// //     float targetVelocity = this->target->getVelocity().len();
+// // /*    if (unlikely(projectileVelocity == 0 && targetVelocity == 0)) // TODO calculate this reasonably*/
+//       tti = 1; // we do have a problem....
+// // //     else
+// // //       tti = (this->getAbsCoor() - this->target->getAbsCoor()).len() / sqrt ( projectileVelocity * projectileVelocity + targetVelocity * targetVelocity);
+//     Vector estTargetDir =  this->getAbsCoor() - this->target->getAbsCoor() + this->target->getVelocity() * (0.5);
+// //     this->setVelocity((this->getAbsCoor() - this->target->getAbsCoor()).getNormalized() * this->velocity.len());
+//     this->velocity = this->newDirection(this->velocity, estTargetDir, this->turningSpeed * time ) * this->maxVelocity;
+//   }
+//   else
+//     if (likely(projectileVelocity != 0))
+//       this->velocity *= (this->maxVelocity / projectileVelocity); // set speed to max
+/*
+  Vector v = this->velocity + this->target->getAbsCoor() - this->getAbsCoor();
+  v.normalize();
+  v *= projectileVelocity;*/
+  this->shiftCoor(velocity * (time));
 
   if(this->tickLifeCycle(time))