Changeset 6218 in orxonox.OLD

Timestamp:

Dec 21, 2005, 12:05:55 PM (18 years ago)

Author:

bensch

Message:

christmas: enter-leave events

Location:

branches/christmas_branche/src/world_entities

Files:

• creatures/md2_creature.cc (modified) (1 diff)
• creatures/md2_creature.h (modified) (1 diff)
• player.cc (modified) (1 diff)
• space_ships/helicopter.cc (modified) (1 diff)
• space_ships/helicopter.h (modified) (3 diffs)
• space_ships/space_ship.cc (modified) (2 diffs)
• space_ships/space_ship.h (modified) (1 diff)

branches/christmas_branche/src/world_entities/creatures/md2_creature.cc

@@ -181 +181 @@
    this->cameraConnNode.addChild(this->getWeaponManager()->getFixedTarget());
   this->getWeaponManager()->getFixedTarget()->setRelCoor(10,0,0);
+
+}
+
+
+void MD2Creature::enter()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+
+
+}
+
+void MD2Creature::leave()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+
 
 }

branches/christmas_branche/src/world_entities/creatures/md2_creature.h

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

branches/christmas_branche/src/world_entities/player.cc

@@ -95 +95 @@
          if (this->controllable != (*node) && (dynamic_cast<PNode*>(*node)->getAbsCoor() - this->controllable->getAbsCoor()).len() < 10.0)
        {
+         this->controllable->leave();
          this->disconnectControllable();
          this->setControllable(dynamic_cast<Playable*>(*node));
+         this->controllable->enter();
          State::getCamera()->setParentSoft(this->controllable);
          State::getCameraTarget()->setParentSoft(this->controllable);

branches/christmas_branche/src/world_entities/space_ships/helicopter.cc

@@ -182 +182 @@
 {
   static_cast<WorldEntity*>(this)->loadParams(root);
+}
+
+
+
+
+void Helicopter::enter()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+
+
+}
+
+void Helicopter::leave()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+
+
 }
 

branches/christmas_branche/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;
 

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

@@ -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);
+
+
+}
 
 /**

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