Changeset 6044 in orxonox.OLD for branches

Timestamp:

Dec 11, 2005, 2:07:27 PM (19 years ago)

Author:

snellen

Message:

WARNING: probably doesnt compile

Location:

branches/spaceshipcontrol

Files:

• configure.ac (modified) (1 diff)
• src/world_entities/space_ships/space_ship.cc (modified) (1 diff)
• src/world_entities/weapons/guided_missile.cc (modified) (2 diffs)

branches/spaceshipcontrol/configure.ac

@@ -738 +738 @@
                  src/lib/physics/Makefile
                  src/lib/particles/Makefile
+                 src/lib/parser/Makefile
+                 src/lib/parser/tinyxml/Makefile
+                 src/lib/parser/ini_parser/Makefile
                  src/lib/collision_detection/Makefile
                  src/lib/network/Makefile

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

@@ -117 +117 @@
   bFire = false;
   xMouse = yMouse = 0;
-  mouseSensitivity = 0.001;
-  airViscosity = 1.0;
-
+  mouseSensitivity = 0.005;
+  airViscosity = 0.1;
   cycle = 0.0;
 

branches/spaceshipcontrol/src/world_entities/weapons/guided_missile.cc

@@ -49 +49 @@
   this->energyMax = 10;
   this->lifeSpan = 5.0;
-  this->agility = 5.0;
+  this->agility = 0.1;
   this->maxVelocity = 100;
 
@@ -151 +151 @@
 void GuidedMissile::tick (float time)
 {
-  //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
+
   if (target != NULL && target->getParent() != NullParent::getInstance())
    {
-     velocity += ((target->getAbsCoor() - this->getAbsCoor()).getNormalized())*agility;
      float speed = velocity.len();
-     if (speed > this->maxVelocity)
-       velocity *= maxVelocity/speed;
+
+     velocity += (((target->getAbsCoor() - this->getAbsCoor()).getNormalized())*speed - velocity)*agility;
+     velocity *= (velocity.getNormalized())*speed;
+
+
+     velocity *= maxVelocity/speed;
 
      this->setAbsDir(Quaternion(velocity, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)));
    }
+
   Vector v = this->velocity * (time);
   this->shiftCoor(v);