Changeset 10087 in orxonox.OLD for branches/playability

Timestamp:

Dec 17, 2006, 9:48:31 PM (18 years ago)

Author:

nicolasc

Message:

smoother drawing, or not

Location:

branches/playability/src/world_entities/projectiles

Files:

• swarm_projectile.cc (modified) (5 diffs)
• swarm_projectile.h (modified) (2 diffs)

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

@@ -114 +114 @@
   this->rotationSpeed = 360;
   this->angle = 0;
+
+  this->curDir = this->lastDir = this->velocity;
 }
 
@@ -210 +212 @@
 
   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);
+  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->target->getAbsCoor() - this->getAbsCoor()).getNormalized() * maxVelocity;
-//     Vector estTargetDir = (this->target->getAbsCoor() - (Vector(2000, 30, 300) + VECTOR_RAND(20))).getNormalized() * projectileVelocity;
     this->velocity = this->newDirection(this->velocity, estTargetDir, this->turningSpeed * time );
-//   }
-//   else
-//     if (likely(projectileVelocity != 0))
-//       this->velocity *= (this->maxVelocity / projectileVelocity); // set speed to max
+  }
+  else
+    if (likely(projectileVelocity != 0))
+      this->velocity *= (this->maxVelocity / projectileVelocity); // set speed to max
 
 //   printf("position: %f, %f, %f\n", this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z);
@@ -233 +234 @@
     this->deactivate();
 
-  this->updateAngle(time);
-
   this->trail->tick(time);
+
+  this->angle += this->rotationSpeed * time;
+
+  this->lastDir = this->curDir;
+  this->curDir = this->velocity;
 }
 
@@ -257 +261 @@
 }
 
-void SwarmProjectile::updateAngle(float time)
-{
-  this->angle += this->rotationSpeed * time;
-}
 
 void SwarmProjectile::draw () const
@@ -267 +267 @@
   glPushMatrix();
 
+  Vector tmpDir = this->curDir *.5 + this->lastDir * .5;
+
   float matrix[4][4];
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  Vector tmpRot = this->getAbsCoor().cross(this->velocity);
-  glRotatef (angleRad ( this->getAbsCoor(), this->velocity), tmpRot.x, tmpRot.y, tmpRot.z );
+  Vector tmpRot = this->getAbsCoor().cross(tmpDir);
+  glRotatef (angleDeg ( this->getAbsCoor(), tmpDir), tmpRot.x, tmpRot.y, tmpRot.z );
   glRotatef(this->angle, 1.0f, 0.0f, 0.0f); //spinning missile
   this->getAbsDir().matrix (matrix);

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

@@ -48 +48 @@
     Vector                            correctionVector;
 
+    Vector                            curDir;
+    Vector                            lastDir;
+
     WorldEntity* hitEntity; // FIXME TEMPORARY
 
@@ -53 +56 @@
 
     // spinning missle
-    void updateAngle(float time);
     float                             rotationSpeed;
     float                             angle;