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

Timestamp:

Jan 24, 2007, 6:13:17 PM (17 years ago)

Author:

marcscha

Message:

SegFault prevention hack in fast factory

File:

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

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

@@ -62 +62 @@
   //this->trail->setParent( this);
   this->trail->setTexture( "maps/laser.png");
+
+
+  this->origList = this->getOMListNumber();
+  this->toList(OM_ENVIRON);
 }
 
@@ -190 +194 @@
     this->deactivate();
 
-/*
-  Vector targetFarFarAway = this->getAbsCoor() + Vector(100000, 0, 0);
-
-  {
-    speed = velocity.len();
-    diffVector = ((targetFarFarAway - this->getAbsCoor()).getNormalized());
-
-    if(velocity.dot(diffVector) != 0)
-    {
-      correctionVector = (( ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )) - velocity).getNormalized()) * agility;
-
-      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)
-        velocity -= correctionVector;
-    }
-    else
-      velocity += diffVector * agility;
-
-    this->setAbsDir(Quaternion(velocity, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)));
-  }
-
-  velocity *= maxVelocity/velocity.len();
-  Vector v = this->velocity * (time);
-  this->shiftCoor(v);*/
 
 
@@ -235 +212 @@
   this->shiftCoor(this->velocity * time);
 
-/*
-
-  Vector pjV = this->getVelocity();
-  Vector tV = this->target->getVelocity();
-  Vector pT = this->target->getAbsCoor() - this->getAbsCoor(); // vector projectile target
-
-  Vector a = tV.getNormalized() * pT.dot(tV.getNormalized());
-
-  float A = 2 * pT.len() * pT.len();
-  float B = 2 * a.len() * a.len();
-  float D = 2 * sqrt(B * B - 4 * pT.len() * pT.len() *(tV.len() * tV.len() - pjV.len() * pjV.len()));
-  float tti;
-
-  if (A != 0){
-    if ( B < D ) tti = ( B + D ) / A;
-    else tti = ( B + D ) / A;
-  }
-  else tti = 0;
-
-
-  Vector estTargetDir;
-  if (tti == 0)
-    estTargetDir = pT.getNormalized() * pjV.len();
-  else
-    estTargetDir = pT / tti + pjV;
-
-  this->velocity = this->newDirection(this->velocity, estTargetDir, this->turningSpeed * time );
-
-  this->shiftCoor(this->velocity * (this->maxVelocity * time));*/
-
   if(this->tickLifeCycle(time))
     this->deactivate();
@@ -276 +223 @@
   this->lastDir = this->curDir;
   this->curDir = this->velocity;
-  if( (this->getAbsCoor() - this->target->getAbsCoor()).len() < 3)   // FIXME  Temp fake workaround for collision :)
+
+  if( this->target != NULL && (this->getAbsCoor() - this->target->getAbsCoor()).len() < 3)   // FIXME  Temp fake workaround for collision :)
   {
-    dynamic_cast<WorldEntity*>(target)->destroy( this);
-    this->destroy( this);
+    dynamic_cast<WorldEntity*>(target)->hit(this->getDamage(), this);
+    this->deactivate();
   }
 }