Changeset 6180 in orxonox.OLD for branches/christmas_branche/src/world_entities

Timestamp:

Dec 20, 2005, 3:21:19 AM (19 years ago)

Author:

patrick

Message:

christmas: cleaned up the model package

Location:

branches/christmas_branche/src/world_entities

Files:

• creatures/md2_creature.cc (modified) (1 diff)
• world_entity.cc (modified) (1 diff)

branches/christmas_branche/src/world_entities/creatures/md2_creature.cc

@@ -254 +254 @@
 
 
-//   // MD2Creature controlled movement
-//   this->calculateVelocity(time);
-//
-//   Vector move = (velocity)*time;
-//
-//   //orient the velocity in the direction of the MD2Creature.
-//   travelSpeed = velocity.len();
-//   velocity += ((this->getAbsDirX())*travelSpeed-velocity)*airViscosity;
-//   velocity = (velocity.getNormalized())*travelSpeed;
-//
-//   //orient the MD2Creature in direction of the mouse
-//    rotQuat = Quaternion::quatSlerp( this->getAbsDir(),mouseDir,fabsf(time)*3);
-//    if (this->getAbsDir().distance(rotQuat) > 0.001)
-//     this->setAbsDir( rotQuat);
-//    //this->setAbsDirSoft(mouseDir,5);
-//
-//   // this is the air friction (necessary for a smooth control)
-//   if(velocity.len() != 0) velocity -= velocity*0.01;
-//
-//   //hoover effect
-//   cycle += time;
-//   this->shiftCoor(Vector(0,1,0)*cos(this->cycle*2.0)*0.02);
-//
-//   //readjust
-//  // if (this->getAbsDirZ().y > 0.1) this->shiftDir(Quaternion(time*0.3, Vector(1,0,0)));
-//   //else if (this->getAbsDirZ().y < -0.1) this->shiftDir(Quaternion(-time*0.3, Vector(1,0,0)));
-//
-//   //SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
-//
-//   this->shiftCoor (move);
-//
-//   this->getWeaponManager()->tick(time);
-//   // weapon system manipulation
-//   this->weaponAction();
+  // MD2Creature controlled movement
+  this->calculateVelocity(time);
+
+  Vector move = (velocity)*time;
+
+  //orient the velocity in the direction of the MD2Creature.
+  travelSpeed = velocity.len();
+  velocity += ((this->getAbsDirX())*travelSpeed-velocity)*airViscosity;
+  velocity = (velocity.getNormalized())*travelSpeed;
+
+  //orient the MD2Creature in direction of the mouse
+   rotQuat = Quaternion::quatSlerp( this->getAbsDir(),mouseDir,fabsf(time)*3);
+   if (this->getAbsDir().distance(rotQuat) > 0.001)
+    this->setAbsDir( rotQuat);
+   //this->setAbsDirSoft(mouseDir,5);
+
+  // this is the air friction (necessary for a smooth control)
+  if(velocity.len() != 0) velocity -= velocity*0.01;
+
+  //hoover effect
+  cycle += time;
+  this->shiftCoor(Vector(0,1,0)*cos(this->cycle*2.0)*0.02);
+
+  //readjust
+ // if (this->getAbsDirZ().y > 0.1) this->shiftDir(Quaternion(time*0.3, Vector(1,0,0)));
+  //else if (this->getAbsDirZ().y < -0.1) this->shiftDir(Quaternion(-time*0.3, Vector(1,0,0)));
+
+  //SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
+
+  this->shiftCoor (move);
+
+  this->getWeaponManager()->tick(time);
+  // weapon system manipulation
+  this->weaponAction();
 }
 

branches/christmas_branche/src/world_entities/world_entity.cc

@@ -136 +136 @@
       PRINTF(4)("fetching MD2 file: %s\n", fileName);
 //         MD2Model* m = (MD2Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN);
-      MD2Model* m = new MD2Model(fileName, "");
-      m->debug();
+      Model* m = new MD2Model(fileName, "md2_fake_texture.bad");
         //this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0);
-      this->setModel((Model*)m, 0);
+      this->setModel(m, 0);
     }
   }