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

Timestamp:

Dec 19, 2006, 8:00:52 PM (17 years ago)

Author:

nicolasc

Message:

some beautifications, nothing new

File:

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

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

@@ -153 +153 @@
 
 
-void Projectile::collidesWith (SpaceShip* target, const Vector& location)
+void Projectile::collidesWith (WorldEntity* target, const Vector& location)
 {
-  target->damage(this->physDamage, this->elecDamage);
+  dynamic_cast<SpaceShip*>(target)->damage(this->getPhysDamage(),this->getElecDamage());
+//   this->destroy(NULL);
   this->destroy(target);
 }
 
-
-/**
- *  this function gets called by tick to calculate the new flight direction
- *  @param curDirection direction vector
- *  @param estTargetDir target vector, pointing to where the target will be on hit
- *  @param angle = tick * turningSpeed
- *  @return normalized (new) direction vector
-*/
-// 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;
-// }
 
 
@@ -190 +168 @@
 void Projectile::tick (float dt)
 {
-/*
-  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))
     this->destroy( NULL );