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

Timestamp:

Jun 10, 2005, 7:17:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: derivations work.
now the only thing to do is specify all the classes, and DO it CLEAN.

@patrick: is it ok, how i treated your ObjectManager??

File:

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

orxonox/trunk/src/world_entities/player.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -48 +48 @@
      the player.cc for debug also
   */
-  this->setClassName("Player");
+  this->setClassID(CL_PLAYER, "Player");
   this->model = (Model*)ResourceManager::getInstance()->load("models/reaplow.obj", OBJ, RP_CAMPAIGN);
   travelSpeed = 15.0;
@@ -60 +60 @@
   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);
@@ -84 +84 @@
    \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), PhysicsInterface(this)
 {
-  this->setClassName("Player");
+  this->setClassID(CL_PLAYER, "Player");
   this->weapons = new tList<Weapon>();
   this->activeWeapon = NULL;
@@ -107 +107 @@
   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);
@@ -162 +162 @@
 
 
-/** 
+/**
     \brief Collision with another Entity has this effect
     \param other the other colider
@@ -177 +177 @@
 */
 void Player::draw ()
-{ 
+{
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
   float matrix[4][4];
-  
+
   /* translate */
-  glTranslatef (this->getAbsCoor ().x, 
-                this->getAbsCoor ().y, 
-                this->getAbsCoor ().z);
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
   /* rotate */
   this->getAbsDir ().matrix (matrix);
   glMultMatrixf((float*)matrix);
-  
+
   this->model->draw();
   glPopMatrix();
@@ -205 +205 @@
   //printf("%p\n", this);
   //this->getRelCoor().debug();
-  
+
   /* link tick to weapon */
   //this->activeWeapon->tick(time);
@@ -236 +236 @@
     accel = accel -(direction*acceleration);
   if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
-    accel = accel - (orthDirection*acceleration); 
+    accel = accel - (orthDirection*acceleration);
   if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
     accel = accel + (orthDirection*acceleration);