Changeset 6426 in orxonox.OLD

Timestamp:

Jan 7, 2006, 11:17:51 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the spaceshipcontrol branche back to the trunk

merged with command
svn merge ​https://svn.orxonox.net/orxonox/branches/spaceshipcontrol . -r6224:HEAD
small conflict in space_ship.cc fixed in favor of the control

Location:

trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• defs/class_id.h (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• world_entities/camera.cc (modified) (1 diff)
• world_entities/space_ships/helicopter.cc (modified) (14 diffs)
• world_entities/space_ships/helicopter.h (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (3 diffs)
• world_entities/space_ships/space_ship.h (modified) (1 diff)
• world_entities/weapons/aiming_turret.cc (modified) (2 diffs)
• world_entities/weapons/guided_missile.cc (modified) (2 diffs)
• world_entities/weapons/targeting_turret.cc (copied) (copied from branches/spaceshipcontrol/src/world_entities/weapons/targeting_turret.cc)
• world_entities/weapons/targeting_turret.h (copied) (copied from branches/spaceshipcontrol/src/world_entities/weapons/targeting_turret.h)

trunk/src/Makefile.am

@@ -76 +76 @@
                   world_entities/weapons/ground_turret.cc \
                   world_entities/weapons/aiming_turret.cc \
+                  world_entities/weapons/targeting_turret.cc \
                   world_entities/weapons/cannon.cc \
                   world_entities/weapons/test_bullet.cc \
@@ -130 +131 @@
                  world_entities/weapons/turret.h \
                  world_entities/weapons/aiming_turret.h \
+                 world_entities/weapons/targeting_turret.h \
                  world_entities/weapons/test_bullet.h \
                  world_entities/weapons/rocket.h \

trunk/src/defs/class_id.h

@@ -179 +179 @@
   CL_AIMING_TURRET              =    0x00000232,
   CL_CANNON                     =    0x00000233,
+  CL_TARGETING_TURRET           =    0x00000234,
 
   CL_TEST_BULLET                =    0x00000240,

trunk/src/orxonox.cc

@@ -32 +32 @@
 #include "gui.h"
 
-#include "world.h"
 #include "parser/ini_parser/ini_parser.h"
 #include "game_loader.h"

trunk/src/world_entities/camera.cc

@@ -199 +199 @@
   Vector up = this->getAbsDirV();
   Vector delay = Vector(0,0,0);
-  if( currentMode != VIEW_FRONT) delay = (this->target->getAbsDirX() * this->target->getSpeed())/30;
+  if( currentMode != VIEW_FRONT) delay = (this->target->getVelocity())/25;
 
   // Setting the Camera Eye, lookAt and up Vectors

trunk/src/world_entities/space_ships/helicopter.cc

@@ -27 +27 @@
 #include "key_mapper.h"
 #include "event_handler.h"
+#include "state.h"
 
 #include "graphics_engine.h"
@@ -117 +118 @@
   xMouse = yMouse = 0;
   mouseSensitivity = 0.001;
+  rotorspeed = 1;
+  tailrotorspeed = 0;
 
   cycle = 0.0;
@@ -137 +140 @@
   registerEvent(SDLK_q);
   registerEvent(SDLK_e);
+  registerEvent(SDLK_c);
   registerEvent(KeyMapper::PEV_FIRE1);
   registerEvent(KeyMapper::PEV_NEXT_WEAPON);
@@ -172 +176 @@
 //   this->getWeaponManager()->setSlotPosition(9, Vector(-2.5, -0.3, 2.0));
 //   this->getWeaponManager()->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
+     
+  this->getWeaponManager()->getFixedTarget()->setParent(this);
+  this->getWeaponManager()->getFixedTarget()->setRelCoor(100000,0,0);
+
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
 
 }
@@ -190 +199 @@
 {
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+  this->attachCamera();
 
 
@@ -197 +207 @@
 {
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
-
+  this->detachCamera();
 
 }
@@ -257 +267 @@
 */
 void Helicopter::tick (float time)
-{
+{ 
+  tailrotorspeed += xMouse/20;
+  if (tailrotorspeed >= 0.07) tailrotorspeed = 0.07;
+  else if (tailrotorspeed <= -0.07) tailrotorspeed = -0.07;
+  
+  if (tailrotorspeed > 0.0008) tailrotorspeed -= 0.001;
+  else if (tailrotorspeed < -0.0008) tailrotorspeed += 0.001;
+  if (tailrotorspeed <= 0.001 && tailrotorspeed >= -0.001) tailrotorspeed = 0;
+  
   // spaceship controlled movement
   this->calculateVelocity(time);
 
-  Vector move = (velocity)*time;
+  Vector move = (velocity);
 
   // this is the air friction (necessary for a smooth control)
   if(velocity.len() != 0) velocity -= velocity*0.1;
 
+  //physics: Gravity
+  this->shiftCoor(Vector(0,-1,0));
+  
+  this->shiftCoor(getAbsDirY()*rotorspeed);
 
   //hoover effect
@@ -278 +300 @@
 
   this->shiftCoor (move);
+  this->shiftDir(Quaternion(-M_PI/4*tailrotorspeed, Vector(0,1,0)));
 
   this->getWeaponManager()->tick(time);
@@ -299 +322 @@
    {
      //this->shiftCoor(this->getAbsDirX());
-
-     accel += Vector(this->getAbsDirX().x,0,this->getAbsDirX().z).getNormalized()*2;
-     if((this->getAbsDirX()).y > -.2)
-     {
-       rot += Vector (0,0,1);
-       rotVal -= time/5;
-     }
+     //accel -= this->getAbsDirY();
+     rot += Vector (0,0,1);
+     rotVal -= time/5;
    }
    else
    {
-       if(this->getAbsDirX().y < -.02) this->shiftDir(Quaternion(time/5, Vector(0,0,1)));
+       if(this->getAbsDirX().y < -.02) this->shiftDir(Quaternion(time/8, Vector(0,0,1)));
    }
 
@@ -315 +334 @@
    {
      //this->shiftCoor((this->getAbsDirX())*-1);
-     accel -= Vector(this->getAbsDirX().x,0,this->getAbsDirX().z).getNormalized()*2;
-     if((this->getAbsDirX()).y < .2)
-     {
-       rot += Vector (0,0,1);
-       rotVal += time/5;
-     }
+     //accel -= this->getAbsDirY();
+     rot += Vector (0,0,1);
+     rotVal += time/5;
    }
    else
    {
-         if(this->getAbsDirZ().y > 0.02) this->shiftDir(Quaternion(-time/5, Vector(0,0,1)));
+         if(this->getAbsDirX().y > 0.02) this->shiftDir(Quaternion(-time/8, Vector(0,0,1)));
    }
 
@@ -330 +346 @@
   {
     //this->shiftDir(Quaternion(time, Vector(0,1,0)));
-    accel -= Vector(this->getAbsDirZ().x,0,this->getAbsDirZ().z).getNormalized()*2;
+    //accel -= this->getAbsDirY();
     //velocityDir.normalize();
-    if((this->getAbsDirZ()).y < .2)
-    {
-      rot +=Vector(1,0,0);
-      rotVal -= time/5;
-    }
+    rot += Vector(1,0,0);
+    rotVal -= time/5;
   }
   else
@@ -346 +359 @@
   {
     //this->shiftDir(Quaternion(-time, Vector(0,1,0)));
-
-    accel += Vector(this->getAbsDirZ().x,0,this->getAbsDirZ().z).getNormalized()*2;
+    accel += this->getAbsDirY();
     //velocityDir.normalize();
-    if((this->getAbsDirZ()).y > -.2)
-    {
-      rot += Vector(1,0,0);
-      rotVal += time/5;
-    }
+    rot += Vector(1,0,0);
+    rotVal += time/5;
   }
   else
@@ -381 +390 @@
     //this->shiftDir(Quaternion(time, Vector(0,0,1)));
 
-    accel += (this->getAbsDirY())*2;
+    rotorspeed += 0.05;
+    if (rotorspeed >= 2) rotorspeed = 2;
     //velocityDir.normalize();
     //rot += Vector(0,0,1);
     //rotVal += .4;
   }
+  else
+  {
+    if(rotorspeed >= 1.05) rotorspeed -= 0.05;
+  }
+  
   if (this->bDescend )
   {
     //this->shiftDir(Quaternion(-time, Vector(0,0,1)));
 
-    accel -= (this->getAbsDirY())*2;
+    rotorspeed -= 0.05;
+    if (rotorspeed <= 0) rotorspeed = 0;
     //velocityDir.normalize();
     //rot += Vector(0,0,1);
     //rotVal -= .4;
   }
-
-  velocity += accel;
+  else
+  {
+    if(rotorspeed <= 0.05) rotorspeed += 0.05;
+  }
+
+  //velocity += accel;
   rot.normalize();
   this->shiftDir(Quaternion(rotVal, rot));
@@ -448 +468 @@
   else if( event.type == EV_MOUSE_MOTION)
   {
-    this->xMouse = event.xRel;
-    this->yMouse = event.yRel;
-    if(((this->getAbsDirX().y) <= .2 && yMouse > 0) || ((this->getAbsDirX().y) >= -.2 && yMouse < 0)) yMouse = 0;
-    this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
+    this->xMouse = event.xRel*mouseSensitivity;
+    this->yMouse = event.yRel*mouseSensitivity;
+    
+    //this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
   }
 }

trunk/src/world_entities/space_ships/helicopter.h

@@ -67 +67 @@
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.
+    float                 rotorspeed;         //!< the speed of the rotor.
+    float                 tailrotorspeed;     //!< the relativ speed ot the tail rotor
 
     float                 airViscosity;

trunk/src/world_entities/space_ships/space_ship.cc

@@ -123 +123 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-    EventHandler::getInstance()->grabEvents(true);
+  EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -315 +315 @@
 
   //readjust
- // if (this->getAbsDirZ().y > 0.1) this->shiftDir(Quaternion(time*0.3, Vector(1,0,0)));
+  
+  /*
+    In the game "Yager" the spaceship gets readjusted when the player moves the mouse.
+    I (bknecht) go and check it out how they do it, we could probably use this also in Orxonox.
+  */
+  //if (xMouse != 0 && yMouse != 0) 
+  
+  //if (this->getAbsDirZ().y > 0.1) this->shiftDir(Quaternion(time*0.3, Vector(1,0,0)));
   //else if (this->getAbsDirZ().y < -0.1) this->shiftDir(Quaternion(-time*0.3, Vector(1,0,0)));
 
@@ -505 +512 @@
     //if (this->getWeaponManager()->hasFreeSlot(3))
     {
-      turret = new AimingTurret();
+      turret = dynamic_cast<Weapon*>(Factory::fabricate(CL_TARGETING_TURRET));
+      if (turret != NULL)
       this->getWeaponManager()->addWeapon(turret, 3);
 

trunk/src/world_entities/space_ships/space_ship.h

@@ -73 +73 @@
     Vector                velocity;           //!< the velocity of the player.
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
-    Quaternion rotQuat;
+    Quaternion            rotQuat;
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -90 +90 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);
-  this->setProjectileType(CL_GUIDED_MISSILE);
+  this->setProjectileType(CL_ROCKET);
 
 
@@ -142 +142 @@
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
 
-  pj->setTarget(this->target->getParent());
   pj->setParent(PNode::getNullParent());
   pj->setAbsCoor(this->getEmissionPoint());

trunk/src/world_entities/weapons/guided_missile.cc

@@ -44 +44 @@
   this->energyMax = 10;
   this->lifeSpan = 10.0;
-  this->agility = 4;
+  this->agility = 500;
   this->maxVelocity = 75;
 
@@ -156 +156 @@
      correctionVector = (( ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )) - velocity).getNormalized()) * agility;
 
-      if(velocity.dot(diffVector) > 0)
+      if( (diffVector *  (speed * speed/( velocity.dot(diffVector ) ) ) -velocity).len() < agility )
+       velocity = ((diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )).getNormalized())*agility;
+      else if(velocity.dot(diffVector) > 0)
         velocity += correctionVector;
       else if (velocity.dot(diffVector) < 0)