Changeset 10132 in orxonox.OLD for branches/playability/src

Timestamp:

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

Author:

marcscha

Message:

Firing Echo fix on WM

Location:

branches/playability/src/world_entities

Files:

• effects/trail.cc (modified) (2 diffs)
• projectiles/mbolt.cc (modified) (3 diffs)
• projectiles/swarm_projectile.cc (modified) (4 diffs)
• projectiles/swarm_projectile.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)
• weapons/medium_blaster.cc (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (1 diff)

branches/playability/src/world_entities/effects/trail.cc

@@ -100 +100 @@
   for( int i = 1; i < sections; i++)
   {
-    this->nodeList[i] = (this->getAbsCoor() - (((this->getParent()->getAbsDir().apply(Vector(1,1,1))).getNormalized() * (i * this->maxLength / sections))));
+    this->nodeList[i] = (this->getAbsCoor());// - (((this->getParent()->getAbsDir().apply(Vector(1,1,1))).getNormalized() * (i * this->maxLength / sections))));
     //PRINTF(0)(" N%i (%f,%f,%f)",i,this->nodeList[i].x,this->nodeList[i].y,this->nodeList[i].z);
   }
@@ -133 +133 @@
 {
   // Update node positions
+  float len = 0;
   float secLen  = this->maxLength / this->sections;
-  this->nodeList[0] = (this->getAbsCoor());
-  for(int i = 1; i < this->sections; i++)
-  {
-    this->nodeList[i] = this->nodeList[i-1] - (this->nodeList[i-1] - this->nodeList[i]).getNormalized()*secLen;
-  }
-  /*
-  this->length  = this->maxLength / (this->getAbsCoor() - this->nodeList[this->sections-1]).len();
-  if (!likely(this->length == 1.0))
-    for(int i = 1; i < this->sections; i++)
-      this->nodeList[i] = this->getAbsCoor()- (this->getAbsCoor() - this->nodeList[i])*this->length;
-  */
-  /*PRINTF(0)("TRAIL POS ");
-  for( int i=0; i < this->sections; i++)
-  {
-    PRINTF(0)("N%i (%f,%f,%f)",i,this->nodeList[i].x,this->nodeList[i].y,this->nodeList[i].z);
-  }
-  PRINTF(0)("\n");*/
+  this->nodeList[0] = this->getAbsCoor();
+  this->nodeList[1] = this->getAbsCoor() - ((this->getParent()->getAbsDir().apply(Vector(1,0,0))).getNormalized() *  this->maxLength / sections);
+  for(int i = 2; i < this->sections; i++)
+  {
+    len = (this->nodeList[i-1] - this->nodeList[i]).len();
+    if( secLen < len) len = secLen;
+    this->nodeList[i] = this->nodeList[i-1] - (this->nodeList[i-1] - this->nodeList[i]).getNormalized()*len;
+  }
 }
 

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

@@ -78 +78 @@
   this->buildObbTree(4);
   
-  this->trail = new Trail(6,4,.1, this);
+  this->trail = new Trail(6, 4, .1, this);
   //this->trail->setParent( this);
   this->trail->setTexture( "maps/laser.png");
@@ -124 +124 @@
   this->setHealth(0);
 
-
   this->emitter->setSpread(0);
   this->emitter->setEmissionRate(10.0);
@@ -150 +149 @@
   this->hitEntity = entity;
   dynamic_cast<SpaceShip*>(entity)->damage(this->getPhysDamage(),this->getElecDamage());
-  this->destroy(this);
+  //this->destroy(this);
+  this->deactivate();
   
   return;
 
-  if( entity == NULL || dynamic_cast<SpaceShip*>(entity) == NULL)
-    return;
-
-  dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
+  //dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
   //entity->destroy(this);
   //this->deactivate();

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];

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

@@ -50 +50 @@
     Vector                            curDir;
     Vector                            lastDir;
+    Vector                            oldPos;
 
     WorldEntity* hitEntity; // FIXME TEMPORARY

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -343 +343 @@
 
   
-  this->trail = new Trail( 10, 10, .2, this);
+  this->trail = new Trail( 30, 100, .2, this);
   //this->trail->setParent( this);
   this->trail->setTexture( "maps/engine.png");
 
-  this->trailL = new Trail( 10, 10, .2, this);
+  this->trailL = new Trail( 30, 100, .2, this);
   //this->trailL->setParent( this);
   this->trailL->setTexture( "maps/engine.png");
 
-  this->trailR = new Trail( 10, 10, .2, this);
+  this->trailR = new Trail( 30, 100, .2, this);
   //this->trailR->setParent( this);
   this->trailR->setTexture( "maps/engine.png");

branches/playability/src/world_entities/weapons/medium_blaster.cc

@@ -56 +56 @@
 
   this->setStateDuration(WS_RELOADING, 0);
-  this->setStateDuration(WS_ACTIVATING, 0); //.5);
-  this->setStateDuration(WS_DEACTIVATING, 0); // 1);
+  this->setStateDuration(WS_ACTIVATING, .5); //.5);
+  this->setStateDuration(WS_DEACTIVATING, 1); // 1);
 
   this->setEnergyMax(500);

branches/playability/src/world_entities/weapons/weapon_manager.cc

@@ -435 +435 @@
   {
           firingWeapon = this->currentSlotConfig[i].currentWeapon;
+      if( firingWeapon != NULL && firingWeapon->getCurrentState() == WS_SHOOTING) continue;
           if( firingWeapon != NULL) firingWeapon->requestAction(WA_SHOOT);
   }