Changeset 10552 in orxonox.OLD for trunk/src

Timestamp:

Jan 31, 2007, 7:23:36 AM (18 years ago)

Author:

patrick

Message:

trail removed

Location:

trunk/src/world_entities

Files:

• npcs/npc.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (6 diffs)

trunk/src/world_entities/npcs/npc.cc

@@ -81 +81 @@
   this->registerObject(this, NPC::_objectList);
 
-  this->toList(OM_GROUP_01);
+  this->toList(OM_GROUP_00);
   this->bAIEnabled = false;
 

trunk/src/world_entities/space_ships/space_ship.cc

@@ -387 +387 @@
 
   /// FIXME
-  this->trail = new Trail( 5, 10, .2, this);
-  this->trail->setTexture( "textures/engine.png");
-
-  this->trailL = new Trail( 5, 10, .2, this);
-  this->trailL->setTexture( "textures/engine.png");
-
-  this->trailR = new Trail( 5, 10, .2, this);
-  this->trailR->setTexture( "textures/engine.png");
+//   this->trail = new Trail( 5, 10, .2, this);
+//   this->trail->setTexture( "textures/engine.png");
+//
+//   this->trailL = new Trail( 5, 10, .2, this);
+//   this->trailL->setTexture( "textures/engine.png");
+//
+//   this->trailR = new Trail( 5, 10, .2, this);
+//   this->trailR->setTexture( "textures/engine.png");
 
 
@@ -499 +499 @@
   WorldEntity::draw();
 
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-
-  float matrix[4][4];
-  glTranslatef (this->getAbsCoor ().x-1, this->getAbsCoor ().y-.2, this->getAbsCoor ().z);
-  this->getAbsDir().matrix (matrix);
-  glMultMatrixf((float*)matrix);
+//   glMatrixMode(GL_MODELVIEW);
+//   glPushMatrix();
+
+//   float matrix[4][4];
+//   glTranslatef (this->getAbsCoor ().x-1, this->getAbsCoor ().y-.2, this->getAbsCoor ().z);
+//   this->getAbsDir().matrix (matrix);
+//   glMultMatrixf((float*)matrix);
   //glScalef(2.0, 2.0, 2.0);  // no double rescale
 
 
-  this->trail->draw();
-
-  glTranslatef(0,0,-.5);
-  this->trailL->draw();
-
-  glTranslatef(0,0,1);
-  this->trailR->draw();
-
-  glPopMatrix();
+//   this->trail->draw();
+
+//   glTranslatef(0,0,-.5);
+//   this->trailL->draw();
+
+//   glTranslatef(0,0,1);
+//   this->trailR->draw();
+
+//   glPopMatrix();
   //this->debug(0);
 }
@@ -579 +579 @@
 
 //FIXME
-  this->trail->tick(time);
-  this->trailL->tick(time);
-  this->trailR->tick(time);
+//   this->trail->tick(time);
+//   this->trailL->tick(time);
+//   this->trailR->tick(time);
 
   if (!this->isTravelDistanceInit)
@@ -1143 +1143 @@
 void SpaceShip::setCameraDistance(float dist)
 {
-     
+
   CameraMan* cm = State::getCameraman();
   Camera* c = cm->getCurrentCam();
   c->setViewTopDistance(dist);
-  
+
   if (this->hasPlayer())
     this->isTravelDistanceInit = false;
@@ -1154 +1154 @@
 void SpaceShip::setCameraFovy(float fovy)
 {
-     
+
   CameraMan* cm = State::getCameraman();
   Camera* c = cm->getCurrentCam();
   c->setViewTopFovy(fovy);
-  
+
   if (this->hasPlayer())
     this->isTravelDistanceInit = false;
@@ -1167 +1167 @@
      CameraMan* cm = State::getCameraman();
      Camera* c = cm->getCurrentCam();
-     
-     
+
+
   float x = 1.25 * this->actionWidthPercentage * fabsf(c->getAbsCoor().y) * tan(c->getFovy()*M_PI /360.0);
   float y = x / c->getAspectRatio() / this->actionWidthPercentage;