Changeset 6162 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Dec 19, 2005, 4:52:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the spaceshipcontroll branche into the trunk
merged with command
svn merge -r6036:HEAD spaceshipcontrol/ ../trunk/
no conflicts

Location:

trunk/src/world_entities/weapons

Files:

• crosshair.cc (modified) (2 diffs)
• guided_missile.cc (modified) (2 diffs)
• guided_missile.h (modified) (1 diff)
• laser.cc (modified) (1 diff)
• test_gun.cc (modified) (1 diff)

trunk/src/world_entities/weapons/crosshair.cc

@@ -67 +67 @@
   this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0);
 
-//  this->setBindNode(this);
+  this->setBindNode(this);
   this->material = new Material;
 
@@ -166 +166 @@
 {
   glPushMatrix();
-  glTranslatef(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2, 0);
+  glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);
 
   glRotatef(this->getAbsDir2D(), 0,0,1);

trunk/src/world_entities/weapons/guided_missile.cc

@@ -45 +45 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->lifeSpan = 5.0;
-  this->agility = 5.0;
-  this->maxVelocity = 100;
+  this->lifeSpan = 10.0;
+  this->agility = 4;
+  this->maxVelocity = 75;
 
   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);
@@ -147 +147 @@
 void GuidedMissile::tick (float time)
 {
-  //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
+
   if (this->target != NULL && this->target->getParent() != PNode::getNullParent())
    {
-     velocity += ((target->getAbsCoor() - this->getAbsCoor()).getNormalized())*agility;
-     float speed = velocity.len();
-     if (speed > this->maxVelocity)
-       velocity *= maxVelocity/speed;
+    speed = velocity.len();
+    diffVector = ((target->getAbsCoor() - this->getAbsCoor()).getNormalized());
+
+    if(velocity.dot(diffVector) != 0)
+    {
+     correctionVector = (( ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )) - velocity).getNormalized()) * agility;
+
+      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);

trunk/src/world_entities/weapons/guided_missile.h

@@ -40 +40 @@
     float                             agility;
     float                             maxVelocity;
+    float                             speed;
+    Vector                            diffVector ;
+    Vector                            correctionVector;
 
     WorldEntity* hitEntity; // FIXME TEMPORARY

trunk/src/world_entities/weapons/laser.cc

@@ -45 +45 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->lifeSpan = 1.0;
+  this->lifeSpan = 5.0;
 
   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);

trunk/src/world_entities/weapons/test_gun.cc

@@ -184 +184 @@
   pj->setParent(PNode::getNullParent());
 
-  pj->setVelocity(this->getVelocity() + this->getAbsDir().apply(Vector(1,0,0))*50+VECTOR_RAND(5));
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
 
   pj->setAbsCoor(this->getEmissionPoint());