Changeset 6205 in orxonox.OLD

Timestamp:

Dec 21, 2005, 1:25:00 AM (18 years ago)

Author:

patrick

Message:

christmas: added shooting animation and weapon

Location:

branches/christmas_branche/src

Files:

• lib/graphics/importer/md2Model.cc (modified) (2 diffs)
• world_entities/creatures/md2_creature.cc (modified) (3 diffs)

branches/christmas_branche/src/lib/graphics/importer/md2Model.cc

@@ -51 +51 @@
     {   0,  39,  9, 1 },   //!< STAND
     {  40,  45, 10, 1 },   //!< RUN
-    {  46,  53, 10, 1 },   //!< ATTACK
+    {  46,  53, 10, 0 },   //!< ATTACK
     {  54,  57,  7, 1 },   //!< PAIN_A
     {  58,  61,  7, 1 },   //!< PAIN_B
@@ -355 +355 @@
 
 //   this->scaleFactor = 1.0f;
-  this->scaleFactor = 0.2f;
+  this->scaleFactor = 0.1f;
 
   this->fileName = NULL;

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

@@ -93 +93 @@
   cannon->setName("BFG");
 
-//   this->getWeaponManager()->addWeapon(wpLeft, 1, 0);
-//   this->getWeaponManager()->addWeapon(wpRight,1 ,1);
+   this->getWeaponManager()->addWeapon(wpLeft, 1, 0);
+   this->getWeaponManager()->addWeapon(wpRight,1 ,1);
 //   this->getWeaponManager()->addWeapon(cannon, 0, 6);
 
@@ -149 +149 @@
   this->getWeaponManager()->setSlotCount(7);
 
-  this->getWeaponManager()->setSlotPosition(0, Vector(-2.6, .1, -3.0));
+  this->getWeaponManager()->setSlotPosition(0, Vector(-0.5, .2, -1.9));
   this->getWeaponManager()->setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
-  this->getWeaponManager()->setSlotPosition(1, Vector(-2.6, .1, 3.0));
+  this->getWeaponManager()->setSlotPosition(1, Vector(-0.5, .2, 1.9));
   this->getWeaponManager()->setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
@@ -261 +261 @@
   {
     ((MD2Model*)this->getModel(0))->setAnim(JUMP);
+  }
+  else if( this->bFire)
+  {
+    if( ((MD2Model*)this->getModel(0))->getAnim() != ATTACK) ((MD2Model*)this->getModel(0))->setAnim(ATTACK);
   }
   else if( fabs(move.len()) > 0.0f)