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

Timestamp:

Dec 21, 2005, 1:49:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/world_entities/space_ships/helicopter.cc (modified) (3 diffs)
• src/world_entities/space_ships/helicopter.h (modified) (3 diffs)
• src/world_entities/space_ships/space_ship.cc (modified) (5 diffs)
• src/world_entities/space_ships/space_ship.h (modified) (1 diff)

trunk/src/world_entities/space_ships/helicopter.cc

@@ -95 +95 @@
 
   this->getWeaponManager()->changeWeaponConfig(1);
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
 }
 
@@ -184 +185 @@
 
 
+
+
+void Helicopter::enter()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+
+
+}
+
+void Helicopter::leave()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+
+
+}
+
+
 /**
  * adds a weapon to the weapon list of the spaceship
@@ -324 +342 @@
          if(this->getAbsDirZ().y > 0.02) this->shiftDir(Quaternion(time/5, Vector(1,0,0)));
    }
-   
+
   if( this->bRight /* > this->getRelCoor().z*2*/)
   {

trunk/src/world_entities/space_ships/helicopter.h

@@ -24 +24 @@
     void loadParams(const TiXmlElement* root);
 
+    virtual void enter();
+    virtual void leave();
+
     void addWeapon(Weapon* weapon );
     void removeWeapon(Weapon* weapon);
@@ -39 +42 @@
 
   private:
-
     void calculateVelocity(float time);
     void weaponAction();
@@ -65 +67 @@
     float                 travelSpeed;        //!< the current speed of the player (to make soft movement)
     float                 acceleration;       //!< the acceleration of the player.
-    
+
     float                 airViscosity;
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -112 +112 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  EventHandler::getInstance()->grabEvents(true);
+//   EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -177 +177 @@
   this->getWeaponManager()->getFixedTarget()->setRelCoor(100000,0,0);
 
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
 }
 
@@ -188 +189 @@
 }
 
+
+void SpaceShip::enter()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+
+
+}
+
+void SpaceShip::leave()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+
+
+}
 
 /**
@@ -267 +282 @@
   velocity += ((this->getAbsDirX())*travelSpeed-velocity)*airViscosity;
   velocity = (velocity.getNormalized())*travelSpeed;
-  
+
   //orient the spaceship in direction of the mouse
    rotQuat = Quaternion::quatSlerp( this->getAbsDir(),mouseDir,fabsf(time)*3);
-   if (this->getAbsDir().distance(rotQuat) > 0.001)  
+   if (this->getAbsDir().distance(rotQuat) > 0.001)
     this->setAbsDir( rotQuat);
    //this->setAbsDirSoft(mouseDir,5);
-   
+
   // this is the air friction (necessary for a smooth control)
   if(velocity.len() != 0) velocity -= velocity*0.01;
@@ -308 +323 @@
   /* calculate the direction in which the craft is heading  */
 
+  Plane plane(Vector(0,1,0), Vector(0,0,0));
+
   if( this->bUp )
    {
      //this->shiftCoor(this->getAbsDirX());
       accel += (this->getAbsDirX())*2;
-      
+
       /* Heli-Steuerung
          accel += (this->getAbsDirX()*2;

trunk/src/world_entities/space_ships/space_ship.h

@@ -26 +26 @@
     void init();
     void loadParams(const TiXmlElement* root);
+
+    virtual void enter();
+    virtual void leave();
 
     void addWeapon(Weapon* weapon );