Changeset 3620 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Mar 21, 2005, 5:37:58 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: added worldinterface, to enable all worldentities to access the entities list. so they can add entities themselfes. this is a nice hack

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (6 diffs)
• player.h (modified) (4 diffs)
• test_gun.cc (modified) (1 diff)
• weapon.cc (modified) (3 diffs)
• weapon.h (modified) (1 diff)

orxonox/trunk/src/world_entities/player.cc

@@ -20 +20 @@
 #include "player.h"
 
+#include "track_manager.h"
+#include "objModel.h"
+#include "weapon.h"
+#include "test_gun.h"
+#include "world.h"
+
+#include "list.h"
 #include "stdincl.h"
-//#include "collision.h"
-#include "objModel.h"
-#include "list.h"
-#include "weapon.h"
-#include "track_manager.h"
 
 using namespace std;
@@ -33 +35 @@
    \param isFree if the player is free
 */
-Player::Player(bool isFree) : WorldEntity(isFree)
-{
-  this->model = new OBJModel("../data/models/reaplow.obj");
+Player::Player() : WorldEntity()
+{
   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
+  */
+  this->model = new OBJModel("../data/models/reaplow.obj");
   travelSpeed = 15.0;
   velocity = new Vector();
@@ -44 +50 @@
   bFire = false;
   acceleration = 10.0;
+  //weapons:
+  Weapon* wp = new TestGun();
+  this->weapons->add(wp);
+  this->activeWeapon = wp;  
 }
 
@@ -51 +61 @@
 Player::~Player ()
 {
-  Weapon* w = this->weapons->enumerate(); 
-  while( w != NULL) 
-    { 
-      delete w;
-      w = this->weapons->nextElement();
-    }
+  /* 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->weapons;
-  
-  //delete this->velocity;
 }
 
@@ -150 +156 @@
 {
   // player controlled movement
-  this->move (time);
+  this->move(time);
   // weapon system manipulation
-  this->fire();
+  this->weapon();
 }
 
@@ -190 +196 @@
    \brief weapon manipulation by the player
 */
-void Player::fire()
+void Player::weapon()
 {
   if( this->bFire)

orxonox/trunk/src/world_entities/player.h

@@ -13 +13 @@
 class Weapon;
 class Vector;
+class World;
 
 //! Basic controllable WorldEntity
@@ -20 +21 @@
   
  public:
-  Player(bool isFree = false);
+  Player();
   virtual ~Player();
 
@@ -48 +49 @@
   tList<Weapon>* weapons;//!< a list of weapon
   Weapon* activeWeapon;  //!< the weapon that is currenty activated
+  World* myWorld;        //!< reference to the world object
 
   Vector* velocity;       //!< the velocity of the player.
@@ -54 +56 @@
   
   void move(float time);
-  void fire(void);
+  void weapon(void);
   
 };

orxonox/trunk/src/world_entities/test_gun.cc

@@ -75 +75 @@
 */
 void TestGun::fire()
-{}
+{
+  printf("TestGun::fire() - firing weapon now ---------------------------\n");
+  //this->myWorld;
+}
 
 

orxonox/trunk/src/world_entities/weapon.cc

@@ -23 +23 @@
 #include "objModel.h"
 #include "projectile.h"
+#include "list.h"
+#include "world.h"
 
 using namespace std;
@@ -33 +35 @@
 */
 Weapon::Weapon () : WorldEntity()
-{}
+{
+  WorldInterface* wi = WorldInterface::getInstance();
+  this->worldEntities = wi->getEntityList();
+}
 
 
@@ -174 +179 @@
 */
 void Weapon::fire()
-{}
+{
+  
+}
 
 

orxonox/trunk/src/world_entities/weapon.h

@@ -76 +76 @@
   Projectile* projectile;
   //WeaponSound sound;
+  tList<WorldEntity>* worldEntities;
 
 };