Changeset 4780 in orxonox.OLD for orxonox/trunk/src/world_entities/player.cc

Timestamp:

Jul 2, 2005, 10:55:47 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: 1. the crosshair is registered, @patrick: i thought it was a little bit harder… worked myself through the EventSystem, it is quite cool

2. Player now knows a loadParams and init routine

also testing the Crosshair inside of the Player

File:

• orxonox/trunk/src/world_entities/player.cc (modified) (3 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -33 +33 @@
 #include "event.h"
 
+#include "crosshair.h"
+
 using namespace std;
 
@@ -48 +50 @@
      the player.cc for debug also
   */
+  this->init();
+
+  //weapons:
+  this->weaponMan = new WeaponManager();
+  Weapon* wpRight = new TestGun(this, Vector(-2.6, 0.1, 3.0), Quaternion(), 0);
+  Weapon* wpLeft = new TestGun(this, Vector(-2.6, 0.1, -3.0), Quaternion(), 1);
+
+  this->weaponMan->addWeapon(wpRight, W_CONFIG0, W_SLOT0);
+  this->weaponMan->addWeapon(wpLeft, W_CONFIG1, W_SLOT1);
+  this->weaponMan->addWeapon(wpRight, W_CONFIG2);
+  this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
+
+}
+
+
+/**
+   \brief destructs the player, deletes alocated memory
+*/
+Player::~Player ()
+{
+  /* do not delete the weapons, they are contained in the pnode tree
+     and will be deleted there.
+     this only frees the memory allocated to save the list.
+  */
+  delete this->weaponMan;
+}
+
+
+/**
+   \brief creates a new Player from Xml Data
+   \param root the xml element containing player data
+
+   \todo add more parameters to load
+*/
+Player::Player(const TiXmlElement* root)
+{
+  this->init();
+  this->loadParams(root);
+
+  //weapons:
+  this->weaponMan = new WeaponManager();
+  Weapon* wpRight = new TestGun(this, Vector(-2.6, 0.1, 3.0), Quaternion(), 0);
+  Weapon* wpLeft = new TestGun(this, Vector(-2.6, 0.1, -3.0), Quaternion(), 1);
+
+  this->weaponMan->addWeapon(wpRight, W_CONFIG0, W_SLOT0);
+  this->weaponMan->addWeapon(wpLeft, W_CONFIG1, W_SLOT1);
+  this->weaponMan->addWeapon(wpRight, W_CONFIG2);
+  this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
+
+
+  new Crosshair();
+}
+
+/**
+ * initializes a Player
+ */
+void Player::init()
+{
   this->setClassID(CL_PLAYER, "Player");
 
@@ -57 +117 @@
   this->bWeaponChange = false;
   acceleration = 10.0;
-  //weapons:
-  this->weaponMan = new WeaponManager();
-  Weapon* wpRight = new TestGun(this, Vector(-2.6, 0.1, 3.0), Quaternion(), 0);
-  Weapon* wpLeft = new TestGun(this, Vector(-2.6, 0.1, -3.0), Quaternion(), 1);
-
-  this->weaponMan->addWeapon(wpRight, W_CONFIG0, W_SLOT0);
-  this->weaponMan->addWeapon(wpLeft, W_CONFIG1, W_SLOT1);
-  this->weaponMan->addWeapon(wpRight, W_CONFIG2);
-  this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
-}
-
-
-/**
-   \brief destructs the player, deletes alocated memory
-*/
-Player::~Player ()
-{
-  /* do not delete the weapons, they are contained in the pnode tree
-     and will be deleted there.
-     this only frees the memory allocated to save the list.
-  */
-  delete this->weaponMan;
-}
-
-
-/**
-   \brief creates a new Player from Xml Data
-   \param root the xml element containing player data
-
-   \todo add more parameters to load
-*/
-Player::Player(const TiXmlElement* root) : WorldEntity(root)
-{
-  this->setClassID(CL_PLAYER, "Player");
-
-  this->weapons = new tList<Weapon>();
-  this->activeWeapon = NULL;
-  /*
-    this is the debug player - actualy we would have to make a new
-     class derivated from Player for each player. for now, we just use
-     the player.cc for debug also
-  */
-  travelSpeed = 15.0;
-  velocity = new Vector();
-  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
-  bFire = false;
-  this->bWeaponChange = false;
-  acceleration = 10.0;
-  //weapons:
-  this->weaponMan = new WeaponManager();
-  Weapon* wpRight = new TestGun(this, Vector(-2.6, 0.1, 3.0), Quaternion(), 0);
-  Weapon* wpLeft = new TestGun(this, Vector(-2.6, 0.1, -3.0), Quaternion(), 1);
-
-  this->weaponMan->addWeapon(wpRight, W_CONFIG0, W_SLOT0);
-  this->weaponMan->addWeapon(wpLeft, W_CONFIG1, W_SLOT1);
-  this->weaponMan->addWeapon(wpRight, W_CONFIG2);
-  this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
+}
+
+
+/**
+ *
+ * @param root the XML-element to load the Player's properties from
+ */
+void Player::loadParams(const TiXmlElement* root)
+{
+  static_cast<WorldEntity*>(this)->loadParams(root);
+
+
+
 }