Changeset 9047 in orxonox.OLD

Timestamp:

Jul 3, 2006, 4:19:47 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Each Playable has an EnterRange

Location:

branches/single_player_map/src/world_entities

Files:

• playable.cc (modified) (1 diff)
• playable.h (modified) (2 diffs)
• player.cc (modified) (3 diffs)
• player.h (modified) (1 diff)
• space_ships/spacecraft_2d.cc (modified) (1 diff)

branches/single_player_map/src/world_entities/playable.cc

@@ -63 +63 @@
   this->score = 0;
   this->collider = NULL;
+  this->enterRadius = 10.0f;
 
   this->bDead = false;

branches/single_player_map/src/world_entities/playable.h

@@ -75 +75 @@
   inline int  getScore() { return this->score; }
 
+  void setEnterRadius(float radius) { this->enterRadius = radius; };
+  /** @returns the EnterRadius (how far away a Player must be to enter this entity) */
+  inline float getEnterRadius() const { return this->enterRadius; };
 
   // WorldEntity Extensions
@@ -117 +120 @@
   Playable::Playmode    playmode;           //!< The current playmode.
 
+  float                 enterRadius;        //!< How far one can be away from the Playable to enter it.
+
   WorldEntity* collider;
 };

branches/single_player_map/src/world_entities/player.cc

@@ -32 +32 @@
 Player::Player()
 {
-//  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
+  //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
   this->setClassID(CL_PLAYER, "Player");
 
@@ -74 +74 @@
   {
     PRINTF(4)("Enter new Playable\n");
-      this->playable = playable;
-      this->hud.setEnergyWidget(this->playable->getHealthWidget());
-      this->hud.setWeaponManager(&this->playable->getWeaponManager());
+    this->playable = playable;
+    this->hud.setEnergyWidget(this->playable->getHealthWidget());
+    this->hud.setWeaponManager(&this->playable->getWeaponManager());
 
-      this->playable->setPlayer(this);
-      return true;
+    this->playable->setPlayer(this);
+    return true;
   }
 
@@ -89 +89 @@
 
 bool Player::eject()
- {
-   return this->setPlayable(NULL);
- }
+{
+  return this->setPlayable(NULL);
+}
 
 
- void Player::weaponConfigChanged()
- {
-   this->hud.updateWeaponManager();
- }
+void Player::weaponConfigChanged()
+{
+  this->hud.updateWeaponManager();
+}
 
- void Player::process(const Event &event)
- {
-   if (event.type == KeyMapper::PEV_CHANGE_SHIP && event.bPressed)
-   {
-     /// FIXME this should be in the ObjectManager
-     const std::list<BaseObject*>* objectList = ClassList::getList(CL_PLAYABLE);
-     if (objectList != NULL)
-     {
-       std::list<BaseObject*>::const_iterator node;
-       for (node = objectList->begin(); node != objectList->end(); node++)
-         if (this->playable != (*node) && (dynamic_cast<PNode*>(*node)->getAbsCoor() - this->playable->getAbsCoor()).len() < 10.0)
-       {
+void Player::enterNewPlayable()
+{
+  /// FIXME this should be in the ObjectManager
+  const std::list<BaseObject*>* objectList = ClassList::getList(CL_PLAYABLE);
+  if (objectList != NULL)
+  {
+    std::list<BaseObject*>::const_iterator node;
+    for (node = objectList->begin(); node != objectList->end(); node++)
+      if (this->playable != (*node) &&
+          (dynamic_cast<PNode*>(*node)->getAbsCoor() - this->playable->getAbsCoor()).len() < (dynamic_cast<Playable*>(*node)->getEnterRadius()))
+      {
 
-         this->setPlayable(dynamic_cast<Playable*>(*node));
+        this->setPlayable(dynamic_cast<Playable*>(*node));
 
-         break;
-       }
-     }
-   }
+        break;
+      }
+  }
+}
 
-   if (likely(this->playable != NULL))
-     this->playable->process(event);
- }
 
+void Player::process(const Event &event)
+{
+  if (event.type == KeyMapper::PEV_CHANGE_SHIP && event.bPressed)
+  {
+    this->enterNewPlayable();
+  }
+
+  if (likely(this->playable != NULL))
+    this->playable->process(event);
+}
+

branches/single_player_map/src/world_entities/player.h

@@ -37 +37 @@
 
     void              weaponConfigChanged();
+    void              enterNewPlayable();
 
     // eventListener extension.

branches/single_player_map/src/world_entities/space_ships/spacecraft_2d.cc

@@ -89 +89 @@
   this->getWeaponManager().changeWeaponConfig(1);
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
-
-  this->loadModel("models/ships/hoverglider_mainbody.obj");
 }