Changeset 6114 in orxonox.OLD for branches

Timestamp:

Dec 14, 2005, 5:51:23 PM (19 years ago)

Author:

snellen

Message:

control in space_ship.cc updated

Location:

branches/spaceshipcontrol/src/world_entities

Files:

• playable.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (7 diffs)
• space_ships/space_ship.h (modified) (2 diffs)
• weapons/crosshair.cc (modified) (2 diffs)
• weapons/laser.cc (modified) (1 diff)
• weapons/test_gun.cc (modified) (1 diff)

branches/spaceshipcontrol/src/world_entities/playable.h

@@ -34 +34 @@
 
     virtual void process(const Event &event) = 0;
+    
 
 

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

@@ -117 +117 @@
   bFire = false;
   xMouse = yMouse = 0;
-  mouseSensitivity = 0.005;
-  airViscosity = 0.1;
+  mouseSensitivity = 0.001;
+  airViscosity = 1.0;
   cycle = 0.0;
 
@@ -124 +124 @@
   travelSpeed = 15.0;
   this->velocity = Vector(0.0,0.0,0.0);
-  this->velocityDir = Vector(1.0,0.0,0.0);
+  this->mouseDir = this->getAbsDir();
 
 //   GLGuiButton* button = new GLGuiPushButton();
@@ -174 +174 @@
 //   this->getWeaponManager()->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
 
+  this->getWeaponManager()->getFixedTarget()->setParent(this);
+  this->getWeaponManager()->getFixedTarget()->setRelCoor(100000,0,0);
+
 }
 
@@ -264 +267 @@
   velocity += ((this->getAbsDirX())*travelSpeed-velocity)*airViscosity;
   velocity = (velocity.getNormalized())*travelSpeed;
-
+  
+  //orient the spaceship in direction of the mouse
+   Quaternion rotQuat = Quaternion::quatSlerp( this->getAbsDir(),mouseDir,fabsf(time));
+   if (this->getAbsDir().distance(rotQuat) > 0.001)  
+     this->setAbsDir( Quaternion::quatSlerp( this->getAbsDir(),mouseDir,fabsf(time)));
+   //this->setAbsDirSoft(mouseDir,5);
+   
   // this is the air friction (necessary for a smooth control)
   if(velocity.len() != 0) velocity -= velocity*0.01;
@@ -337 +346 @@
   if( this->bRollL /* > -this->getRelCoor().z*2*/)
   {
-    this->shiftDir(Quaternion(-time, Vector(1,0,0)));
+    mouseDir *= Quaternion(-time, Vector(1,0,0));
 //    accel -= rightDirection;
     //velocityDir.normalize();
@@ -345 +354 @@
   if( this->bRollR /* > this->getRelCoor().z*2*/)
   {
-    this->shiftDir(Quaternion(time, Vector(1,0,0)));
+    mouseDir *= Quaternion(time, Vector(1,0,0));
 
     //    accel += rightDirection;
@@ -413 +422 @@
     this->xMouse = event.xRel;
     this->yMouse = event.yRel;
-    this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
+    mouseDir *= (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
+    
   }
 }

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

@@ -8 +8 @@
 
 #include "playable.h"
+
 
 template<class T> class tList;
@@ -64 +65 @@
 
     Vector                velocity;           //!< the velocity of the player.
-    Vector                velocityDir;        //!< the direction of the velocity of the spaceship
+    Quaternion            mouseDir;           //!< the direction where the player wants to fly
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.

branches/spaceshipcontrol/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);

branches/spaceshipcontrol/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);

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

@@ -186 +186 @@
   pj->setParent(NullParent::getInstance());
 
-  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());