Changeset 10104 in orxonox.OLD for branches/playability/src/world_entities/projectiles/swarm_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/swarm_projectile.cc (modified) (8 diffs)

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

@@ -3 +3 @@
    orxonox - the future of 3D-vertical-scrollers
 
-   Copyright (C) 2004 orx
+   Copyright (C) 2004-2006 orx
 
    This program is free software; you can redistribute it and/or modify
@@ -11 +11 @@
 
    ### File Specific
-   main-programmer: Silvan Nellen
+   main-programmer: Marc Schaerrer, Nicolas Schlumberger
    co-programmer:
 
@@ -58 +58 @@
 
   this->physDamage = 200;
+  this->elecDamage = 0;
 
   this->trail = new Trail(2.5,4,.2, this);
@@ -135 +136 @@
     this->destroy( entity );
   this->hitEntity = entity;
-  dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),0);
+  dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
+  this->destroy(NULL);
 }
 
@@ -219 +221 @@
 //     else
 //       tti = (this->getAbsCoor() - this->target->getAbsCoor()).len() / sqrt ( projectileVelocity * projectileVelocity + targetVelocity * targetVelocity);
-    Vector estTargetDir = (this->target->getAbsCoor() - this->getAbsCoor()).getNormalized() * maxVelocity;
+    Vector estTargetDir = (this->target->getAbsCoor() - this->getAbsCoor());
+//     estTargetDir.slerpTo(this->velocity, 1);
     this->velocity = this->newDirection(this->velocity, estTargetDir, this->turningSpeed * time );
   }
   else
-    if (likely(projectileVelocity != 0))
+    if (likely(projectileVelocity != 0 || projectileVelocity != this->maxVelocity) )
       this->velocity *= (this->maxVelocity / projectileVelocity); // set speed to max
 
@@ -240 +243 @@
   this->lastDir = this->curDir;
   this->curDir = this->velocity;
-  if( (this->getAbsCoor() - this->target->getAbsCoor()).len() < 4)   // FIXME  Temp fake workaround for collision :)
+  if( (this->getAbsCoor() - this->target->getAbsCoor()).len() < 1)   // FIXME  Temp fake workaround for collision :)
   {
     dynamic_cast<WorldEntity*>(target)->destroy( this);
@@ -253 +256 @@
 {
 
-  printf("THIS SHOULD WORLk\n");
+  printf("THIS SHOULD WORK!\n");
 
   Projectile::destroy( killer );
@@ -272 +275 @@
   glPushMatrix();
 
-  Vector tmpDir = this->curDir *.5 + this->lastDir * .5;
+  Vector tmpDir = this->curDir *.7 + this->lastDir * .3;
 
   float matrix[4][4];