Changeset 6804 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Jan 28, 2006, 11:29:03 AM (18 years ago)

Author:

bensch

Message:

trunk: remastered Playables a bit

Location:

trunk/src/world_entities/space_ships

Files:

• helicopter.cc (modified) (15 diffs)
• helicopter.h (modified) (3 diffs)
• hover.cc (modified) (6 diffs)
• space_ship.cc (modified) (2 diffs)
• space_ship.h (modified) (2 diffs)

trunk/src/world_entities/space_ships/helicopter.cc

@@ -124 +124 @@
 
   //cycle = 0.0;
-  
+
   // cameraissue
   this->cameraNode.setParent(this);
   this->cameraNode.setParentMode(PNODE_ALL);
-  
-  
+
+
   // rotors
   this->topRotor.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
   this->tailRotor.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
-  
+
   this->topRotor.setParent(this);
   this->tailRotor.setParent(this);
-  
+
   this->topRotor.setRelCoor(Vector(-0.877,0.627,0));
   this->tailRotor.setRelCoor(Vector(-4.43,0.297,0.068));
   this->tailRotor.setAbsDir(Quaternion(M_PI_2,Vector(1,0,0)));
-  
+
   this->loadModel("models/ships/rotor.obj",1.0,3);
   this->loadModel("models/ships/rotor.obj",0.2,4);
@@ -274 +274 @@
 void Helicopter::tick (float time)
 {
+  Playable::tick(time);
+
   if( xMouse != 0 || yMouse != 0)
    {
@@ -281 +283 @@
     else if (yMouse < -controlVelocityY) yMouse = -controlVelocityY;
   }
-  
+
   // rotorrotation
   this->topRotor.shiftDir(Quaternion(time*10, Vector(0,1,0)));
   this->tailRotor.shiftDir(Quaternion(time*10, Vector(0,1,0)));
-  
+
   // spaceship controlled movement
   this->calculateVelocity(time);
@@ -293 +295 @@
   // this is the air friction (necessary for a smooth control)
   if(velocity.len() != 0) velocity -= velocity*0.1;
-  
+
   //travelSpeed = velocity.len();
 
@@ -301 +303 @@
   this->shiftCoor(getAbsDirY()*rotorspeed);
   */
-  
+
   /*
   //hoover effect
@@ -316 +318 @@
   this->shiftCoor (move);
   //this->shiftDir(Quaternion(-M_PI/4*tailrotorspeed, Vector(0,1,0)));
-
-  this->getWeaponManager()->tick(time);
-  // weapon system manipulation
-  this->weaponAction();
 }
 
@@ -338 +336 @@
      //this->shiftCoor(this->getAbsDirX());
      //accel -= this->getAbsDirY();
-     
+
      accel += Vector((this->getAbsDirX()).x,0,(this->getAbsDirX()).z);
      if((this->getAbsDirX()).y >= -0.1) rotValZ -= time;
@@ -351 +349 @@
      //this->shiftCoor((this->getAbsDirX())*-1);
      //accel -= this->getAbsDirY();
-     
+
      accel -= Vector((this->getAbsDirX()).x,0,(this->getAbsDirX()).z);
      rotValZ += time;
@@ -365 +363 @@
     //accel -= this->getAbsDirY();
     //velocityDir.normalize();
-    
+
     accel -= Vector((this->getAbsDirZ()).x,0,(this->getAbsDirZ()).z);
     rotValX -= time;
@@ -379 +377 @@
     //accel += this->getAbsDirY();
     //velocityDir.normalize();
-    
+
     accel += Vector((this->getAbsDirZ()).x,0,(this->getAbsDirZ()).z);
     rotValX += time;
@@ -446 +444 @@
 {
   WorldEntity::draw();
-  
+
   glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
@@ -474 +472 @@
 }
 
-
-/**
- * weapon manipulation by the player
-*/
-void Helicopter::weaponAction()
-{
-  if( this->bFire)
-    {
-      this->getWeaponManager()->fire();
-    }
-}
-
 /**
  * @todo switch statement ??
@@ -491 +477 @@
 void Helicopter::process(const Event &event)
 {
-
+  Playable::process(event);
 
   if( event.type == KeyMapper::PEV_LEFT)
@@ -497 +483 @@
   else if( event.type == KeyMapper::PEV_RIGHT)
       this->bRight = event.bPressed;
-  else if( event.type == KeyMapper::PEV_FIRE1)
-      this->bFire = event.bPressed;
-  else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
-    this->getWeaponManager()->nextWeaponConfig();//if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
-  else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
-    this->getWeaponManager()->previousWeaponConfig();
   else if( event.type == SDLK_e)
     this->bAscend = event.bPressed; //this->shiftCoor(0,.1,0);
@@ -517 +497 @@
 
     this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0)));
-    
+
     Quaternion yDir = Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1));
 
-    
+
     if ((this->cameraNode.getAbsDirY()).y < 0.5)
     {

trunk/src/world_entities/space_ships/helicopter.h

@@ -21 +21 @@
     virtual ~Helicopter();
 
-    void init();
     virtual void loadParams(const TiXmlElement* root);
 
@@ -40 +39 @@
 
   private:
+    void init();
     void calculateVelocity(float time);
-    void weaponAction();
 
     // !! temporary !!
@@ -63 +62 @@
     int                   controlVelocityY;
     //float                 cycle;              //!< hovercycle
-    
+
     PNode                 topRotor;
     PNode                 tailRotor;
-    
+
     PNode                 cameraNode;
 

trunk/src/world_entities/space_ships/hover.cc

@@ -252 +252 @@
  * @param time The timespan passed since last update
 */
-void Hover::tick (float time)
-{
+void Hover::tick (float dt)
+{
+  Playable::tick(dt);
+
   if( xMouse != 0 || yMouse != 0)
    {
@@ -263 +265 @@
 
   // spaceship controlled movement
-  this->calculateVelocity(time);
-
-  Vector move = (velocity)*time;
+  this->calculateVelocity(dt);
+
+  Vector move = (velocity)*dt;
 
   // this is the air friction (necessary for a smooth control)
@@ -271 +273 @@
   this->shiftCoor (move);
 
-  this->getWeaponManager()->tick(time);
-  // weapon system manipulation
-  this->weaponAction();
 }
 
@@ -400 +399 @@
 {
   Vector tmpRot;
-
   WorldEntity::draw();
 
@@ -463 +461 @@
 void Hover::process(const Event &event)
 {
-
+  Playable::process(event);
 
   if( event.type == KeyMapper::PEV_LEFT)
@@ -469 +467 @@
   else if( event.type == KeyMapper::PEV_RIGHT)
       this->bRight = event.bPressed;
-  else if( event.type == KeyMapper::PEV_FIRE1)
-      this->bFire = event.bPressed;
-  else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
-    this->getWeaponManager()->nextWeaponConfig();//if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
-  else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
-    this->getWeaponManager()->previousWeaponConfig();
   else if( event.type == SDLK_e)
     this->bAscend = event.bPressed; //this->shiftCoor(0,.1,0);

trunk/src/world_entities/space_ships/space_ship.cc

@@ -306 +306 @@
 void SpaceShip::tick (float time)
 {
-  this->getWeaponManager()->tick(time);
-  // weapon system manipulation
-  this->weaponAction();
+  Playable::tick(time);
 
   if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == this->getHostID() )
@@ -464 +462 @@
 
 /**
- * weapon manipulation by the player
-*/
-void SpaceShip::weaponAction()
-{
-  if( this->bFire)
-    {
-      this->getWeaponManager()->fire();
-    }
-}
-
-/**
  * @todo switch statement ??
  */
 void SpaceShip::process(const Event &event)
 {
+  Playable::process(event);
+
   if( event.type == KeyMapper::PEV_LEFT)
       this->bRollL = event.bPressed;
   else if( event.type == KeyMapper::PEV_RIGHT)
       this->bRollR = event.bPressed;
-  else if( event.type == KeyMapper::PEV_FIRE1)
-      this->bFire = event.bPressed;
-  else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
-  {
-    this->nextWeaponConfig();//if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
-  }
-  else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
-    this->previousWeaponConfig();
   else if( event.type == KeyMapper::PEV_UP)
     this->bUp = event.bPressed; //this->shiftCoor(0,.1,0);

trunk/src/world_entities/space_ships/space_ship.h

@@ -27 +27 @@
     virtual ~SpaceShip();
 
-    void init();
     virtual void loadParams(const TiXmlElement* root);
 
@@ -47 +46 @@
 
   private:
+    void init();
 
     void calculateVelocity(float time);
-    void weaponAction();
 
     // !! temporary !!