Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/world_entities/player.cc

Timestamp:

Mar 18, 2005, 11:52:15 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/world_entities/player.cc (modified) (10 diffs)

orxonox/branches/levelloader/src/world_entities/player.cc

@@ -16 +16 @@
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PLAYER
+
 #include "player.h"
+
 #include "stdincl.h"
 //#include "collision.h"
 #include "objModel.h"
+#include "list.h"
+#include "weapon.h"
+#include "track_manager.h"
 
 using namespace std;
@@ -31 +37 @@
 Player::Player(bool isFree) : WorldEntity(isFree)
 {
-
   this->model = new OBJModel("../data/models/reaplow.obj");
-  /*
-  objectList = glGenLists(1);
-  glNewList (objectList, GL_COMPILE);
-
-  glBegin(GL_TRIANGLES);
-  glColor3f(1,1,1);
-  glVertex3f(0,0,0.5);
-  glVertex3f(-0.5,0,-1);
-  glVertex3f(0.5,0,-1);
-
-  glVertex3f(0,0,0.5);
-  glVertex3f(0,0.5,-1);
-  glVertex3f(0,-0.5,-1);
-  glEnd();
-    
-  glBegin(GL_QUADS);
-  glColor3f(0,0,1);
-  glVertex3f(0.5,0.5,-1);
-  glVertex3f(0.5,-0.5,-1);
-  glVertex3f(-0.5,-0.5,-1);
-  glVertex3f(-0.5,0.5,-1);
-  glEnd();
-  
-  glEndList ();
-  */
-}
+  this->weapons = new tList<Weapon>();
+  this->activeWeapon = NULL;
+
+  travelSpeed = 15.0;
+  velocity = Vector();
+  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
+  bFire = false;
+  acceleration = 10.0;
+}
+
+/**
+   \brief destructs the player, deletes alocated memory
+*/
+Player::~Player ()
+{
+  Weapon* w = this->weapons->enumerate(); 
+  while( w != NULL) 
+    { 
+      delete w;
+      w = this->weapons->nextElement();
+    }
+  delete this->weapons;
+  
+  //delete this->velocity;
+}
+
 
 /**
@@ -102 +107 @@
 
 /**
-   \brief destructs the player
-*/
-Player::~Player ()
-{
-  delete this->model;
-}
+   \brief adds a weapon to the weapon list of player
+   \param weapon to add
+*/
+void Player::addWeapon(Weapon* weapon)
+{
+  this->weapons->add(weapon);
+}
+
+
+/**
+   \brief removes a weapon from the player
+   \param weapon to remove
+*/
+void Player::removeWeapon(Weapon* weapon)
+{
+  this->weapons->remove(weapon);
+}
+
 
 /**
@@ -114 +131 @@
 void Player::postSpawn ()
 {
-  travelSpeed = 15.0;
-  velocity = Vector();
-  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
-  bFire = false;
-  acceleration = 10.0;
   //setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
 }
 
-/**
-   \brief the function called for each passing timeSnap
-   \param time The timespan passed since last update
-*/
-void Player::tick (float time)
-{
-  // movement
-  this->move (time);
-}
+
+/**
+   \brief the action occuring if the player left the game
+*/
+void Player::leftWorld ()
+{}
+
+
 
 /**
@@ -137 +148 @@
    \param loc ??
 */
-void Player::hit (WorldEntity* weapon, Vector loc)
-{
-}
-
-/**
-   \brief action that happens when the player is destroyed.
-*/
-void Player::destroy ()
-{
-}
+void Player::hit (WorldEntity* weapon, Vector* loc)
+{
+}
+
 
 /** 
@@ -158 +163 @@
 }
 
-/**
-   \brief The connection to the command node
-   \param cmd the Command unit from witch to map
-
-   here the commands are mapped to the players movement/weaponary
-*/
-void Player::command (Command* cmd)
-{
-  //printf("Player|recieved command [%s]\n", cmd->cmd);
-  if( !strcmp( cmd->cmd, "up")) bUp = !cmd->bUp;
-  else if( !strcmp( cmd->cmd, "down")) bDown = !cmd->bUp;
-  else if( !strcmp( cmd->cmd, "left")) bLeft = !cmd->bUp;
-  else if( !strcmp( cmd->cmd, "right")) bRight = !cmd->bUp;
-  else if( !strcmp( cmd->cmd, "fire")) bFire = !cmd->bUp;
-}
 
 /**
@@ -180 +170 @@
 { 
   glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
+  glPushMatrix();
   float matrix[4][4];
   
@@ -191 +181 @@
   glMultMatrixf((float*)matrix);
   
-  glMatrixMode(GL_MODELVIEW);
   this->model->draw();
-  // glCallList(objectList);
-}
-
-
-/*PN
-  void Player::getLookat(Location* locbuf)
-  {
-  *locbuf = *getLocation();
-  //locbuf->dist += 5.0;
-  }
-*/
-
-/**
-   \brief the action occuring if the player left the game
-*/
-void Player::leftWorld ()
-{
-}
+  glPopMatrix();
+}
+
+
+/**
+   \brief the function called for each passing timeSnap
+   \param time The timespan passed since last update
+*/
+void Player::tick (float time)
+{
+  // player controlled movement
+  this->move (time);
+  // weapon system manipulation
+  this->fire();
+}
+
 
 /**
@@ -220 +207 @@
   Vector accel(0.0, 0.0, 0.0);
   /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
-  //Placement *pos = getPlacement();
   
   /* calculate the direction in which the craft is heading  */
@@ -228 +214 @@
   //orthDirection = orthDirection.cross (direction);
 
-  if( bUp) { accel = accel+(direction*acceleration); }
-  if( bDown) { accel = accel-(direction*acceleration); }
-  if( bLeft ) { accel = accel - (orthDirection*acceleration); }
-  if( bRight ) { accel = accel + (orthDirection*acceleration); }
-  if( bAscend ) { /* not yet implemented but just: (0,0,1)*acceleration */}
-  if( bDescend) {/* FIXME */} /* \todo up and down player movement */
-
-  //Location* l = getLocation();
-  
-  // r(t) = r(0) + v(0)*t + 1/2*a*t^2
-  // r = position
-  // v = velocity
-  // a = acceleration
-
-  /* this the base-speed of the player: determines how fast and how the player follows the track*/
-  //l->dist = l->dist + travelSpeed * time;
-  
-  Vector* shift = new Vector (this->travelSpeed * time, 0, 0);
-  this->shiftCoor (shift);
-  
-  /* this updates the player position on the track - user interaction */
-  //l->pos = l->pos + accel*time;
+  if( this->bUp && this->getRelCoor().x < 20)
+    accel = accel+(direction*acceleration);
+  if( this->bDown && this->getRelCoor().x > -5)
+    accel = accel-(direction*acceleration);
+  if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
+    accel = accel - (orthDirection*acceleration); 
+  if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
+    accel = accel + (orthDirection*acceleration);
+  if( this->bAscend )
+  if( this->bDescend) {/* FIXME */} /* \todo up and down player movement */
+
   Vector move = accel * time;
   this->shiftCoor (&move);
 }
+
+
+/**
+   \brief weapon manipulation by the player
+*/
+void Player::fire()
+{
+  if(this->bFire)
+    {
+      if(this->activeWeapon != NULL)
+        this->activeWeapon->fire();
+    }
+  if(this->bWeaponChange)
+    {
+      Weapon* w = this->weapons->enumerate(); 
+      this->activeWeapon = this->weapons->nextElement(this->activeWeapon);
+    }
+}
+
+
+/**
+   \brief The connection to the command node
+   \param cmd the Command unit from witch to map
+
+   here the commands are mapped to the players movement/weaponary
+*/
+void Player::command (Command* cmd)
+{
+  PRINTF(3)("recieved command [%s]\n", cmd->cmd);
+  if( !strcmp( cmd->cmd, "up")) this->bUp = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "down")) this->bDown = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "left")) this->bLeft = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "right")) this->bRight = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "fire")) this->bFire = !cmd->bUp;
+  else if( !strcmp( cmd->cmd, "mode")) this->bWeaponChange = !cmd->bUp;
+}