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

Timestamp:

Mar 17, 2005, 2:15:33 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: fixed movement bug (was in the lists), modified the player

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (2 diffs)
• primitive.cc (modified) (1 diff)
• primitive.h (modified) (1 diff)
• skysphere.cc (modified) (3 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -167 +167 @@
   //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 */
+  if( this->bUp) { accel = accel+(direction*acceleration); }
+  if( this->bDown) { accel = accel-(direction*acceleration); }
+  if( this->bLeft ) { accel = accel - (orthDirection*acceleration); }
+  if( this->bRight ) { accel = accel + (orthDirection*acceleration); }
+  if( this->bAscend ) { /* not yet implemented but just: (0,0,1)*acceleration */}
+  if( this->bDescend) {/* FIXME */} /* \todo up and down player movement */
 
   Vector move = accel * time;
@@ -211 +211 @@
   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, "weapon_mode")) this->bWeaponChange = !cmd->bUp;
-}
+  else if( !strcmp( cmd->cmd, "mode")) this->bWeaponChange = !cmd->bUp;
+}

orxonox/trunk/src/world_entities/primitive.cc

@@ -26 +26 @@
 
 
+
+/**
+   \brief standard constructor
+*/
 Primitive::Primitive (PRIMITIVE_FORM form) : WorldEntity()
 {
-  this->model = new OBJModel("../data/models/fighter.obj");
+  //this->model = new OBJModel("../data/models/fighter.obj");
   //this->model = new OBJModel("");
+  this->object = gluNewQuadric();
+
+  gluQuadricTexture(this->object, GL_TRUE);
+
+  this->material = new Material("Sky");
+  this->material->setDiffuseMap("../data/pictures/sky-replace.jpg");
+  this->material->setIllum(3);
+  this->material->setAmbient(1.0, 1.0, 1.0);
 }
 
 
-
+/**
+   \brief standard deconstructor
+*/
 Primitive::~Primitive () 
 {
-
+  delete this->material;
+  free(this->object);
 }
 
+/**
+   \brief called, when the object gets hit
+   \param other object, that hits it
+   \param location of impact
+*/
+void Primitive::hit (WorldEntity* weapon, Vector* loc) {}
+
+
+/**
+   \brief object collides
+*/
+void Primitive::collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags) {}
+
+
+/**
+   \brief tick singal put everything here, that is timedependent
+   \param time in sec
+*/
 void Primitive::tick (float time) 
 {
-  Vector v(0.0, 0.0, 1.0);
-  Quaternion q(10.0, v);
+  //Vector v(0.0, 0.0, 1.0);
+  //Quaternion q(10.0, v);
   //this->relDirection = this->relDirection * q;
 }
 
-void Primitive::hit (WorldEntity* weapon, Vector* loc) {}
-
-
-void Primitive::collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags) {}
-
+/**
+   \brief drawing function of the object
+*/
 void Primitive::draw () 
 {
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
+
   float matrix[4][4];
-  
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
   //rotate
-  this->getAbsDir().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-  
-  this->model->draw();
+  //this->getAbsDir().matrix (matrix);
+  //glMultMatrixf((float*)matrix);
+  gluSphere(this->object, 2, 20, 20);
+
   glPopMatrix();
 }

orxonox/trunk/src/world_entities/primitive.h

@@ -19 +19 @@
   virtual void draw ();
 
+ private:
+  GLUquadricObj *object; //!< the object to be rendered
+  Material *material;    //!< A Material for the SkySphere.
+
 };
 

orxonox/trunk/src/world_entities/skysphere.cc

@@ -38 +38 @@
 Skysphere::Skysphere()
 {  
-  initialize("../data/pictures/sky-replace.jpg");
+  this->initialize("../data/pictures/sky-replace.jpg");
 }
 
@@ -48 +48 @@
 Skysphere::Skysphere(char* fileName)
 {
-  initialize(fileName);
+  this->initialize(fileName);
 }
 
@@ -108 +108 @@
   
   skyMaterial->select();
-  gluSphere(sphereObj, sphereRadius, 20, 20);
+  gluSphere(this->sphereObj, this->sphereRadius, 20, 20);
   glPopMatrix();
 }