Changeset 10152 in orxonox.OLD for branches

Timestamp:

Dec 27, 2006, 12:03:36 PM (18 years ago)

Author:

nicolasc

Message:

finished animation on heavy blaster, started light blaster
code needs some cleanup

Location:

branches/playability/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (3 diffs)
• weapons/heavy_blaster.cc (modified) (11 diffs)
• weapons/heavy_blaster.h (modified) (3 diffs)
• weapons/light_blaster.cc (modified) (4 diffs)
• weapons/light_blaster.h (modified) (1 diff)
• weapons/weapon.cc (modified) (4 diffs)
• weapons/weapon.h (modified) (5 diffs)

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -161 +161 @@
   //wpLeft2->setParent( this);
   
-  Weapon* wpRight3 = new HeavyBlaster ();
+  Weapon* wpRight3 = new HeavyBlaster (1);
   wpRight3->setName( "HeavyBlaster");
   //wpRight3->setParent( this);
-  Weapon* wpLeft3 = new HeavyBlaster ();
+  Weapon* wpLeft3 = new HeavyBlaster (0);
   wpLeft3->setName( "HeavyBlaster");
   //wpLeft3->setParent( this);
@@ -182 +182 @@
   this->weaponMan.addWeapon( wpRight3, 2, 5);
 
+  this->weaponMan.addWeapon( wpLeft1, 3, 0);
+  this->weaponMan.addWeapon( wpRight1, 3, 1);
+
+  this->weaponMan.addWeapon( wpLeft2, 3, 2);
+  this->weaponMan.addWeapon( wpRight2, 3, 3);
+
+  this->weaponMan.addWeapon( wpLeft3, 3, 4);
+  this->weaponMan.addWeapon( wpRight3, 3, 5);
+
   this->secWeaponMan.addWeapon( cannon, 0, 0);
 
   
-  this->weaponMan.changeWeaponConfig(2);
+  this->weaponMan.changeWeaponConfig(3);
   this->secWeaponMan.changeWeaponConfig(0);
 
@@ -274 +283 @@
   this->weaponMan.setSlotCount(6);
 
-  this->weaponMan.setSlotPosition(0, Vector(-2.6, 0, -3.0));
+  this->weaponMan.setSlotPosition(0, Vector(0.0, 0, -3.0));
   this->weaponMan.setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
-  this->weaponMan.setSlotPosition(1, Vector(-2.6, 0, 3.0));
+  this->weaponMan.setSlotPosition(1, Vector(0.0, 0, 3.0));
   this->weaponMan.setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 

branches/playability/src/world_entities/weapons/heavy_blaster.cc

@@ -15 +15 @@
  * Standard constructor
  */
-HeavyBlaster::HeavyBlaster ()
+HeavyBlaster::HeavyBlaster (int leftRight)
  : Weapon()
 {
-    this->init();
+    this->init(leftRight);
 }
 
@@ -24 +24 @@
  : Weapon()
 {
-    this->init();
+    // TODO add leftRight to params
+    this->init(0);
     if (root != NULL)
       this->loadParams(root);
@@ -34 +35 @@
 HeavyBlaster::~HeavyBlaster()
 {
-      // model will be deleted from WorldEntity-destructor
+  this->deconstr();
+     // model will be deleted from WorldEntity-destructor
 }
 
@@ -42 +44 @@
 }
 
-void HeavyBlaster::init()
-{
+void HeavyBlaster::init(int leftRight)
+{
+
+  this->leftRight = leftRight;
   //this->registerObject(this, HeavyBlaster::_objectList);
 
@@ -70 +74 @@
   this->setBarrels(3);
   this->setSegs(2);
-
-  this->objComp1 = new PNode;
-  this->objComp2 = new PNode;
-  this->objComp3 = new PNode;
-  this->objComp4 = new PNode;
-  this->objComp5 = new PNode;
-  this->objComp6 = new PNode;
-
-  Animation3D* animB0Shoot = this->getAnimation(WS_SHOOTING0, this->objComp1);
+  this->activeBarrel = 0;
+//   this->init2();
+
+
+
+  this->objComp = new PNode**[this->getBarrels()];
+  this->emissionPoint = new PNode*[this->getBarrels()];
+  this->shootAnim = new Animation3D**[this->getBarrels()];
+  for (int i = 0; i < this->getBarrels(); i++)
+  {
+    this->objComp[i] = new PNode* [this->getSegs()];
+    this->emissionPoint[i] = new PNode;
+    this->emissionPoint[i]->setParent(this);             //< One EmissionPoint, that is a PNode connected to the weapon. You can set this to the exitting point of the Projectiles
+    this->emissionPoint[i]->setName("EmissionPoint");
+    this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+    this->shootAnim[i] = new Animation3D* [this->getSegs()];
+    for(int j = 0; j < this->getSegs(); j++)
+    {
+      this->objComp[i][j] = new PNode;
+      this->shootAnim[i][j] = new Animation3D(this->objComp[i][j]);
+      this->shootAnim[i][j]->setInfinity(ANIM_INF_CONSTANT);
+    }
+  }
+
+    this->emissionPoint[0]->setRelCoor(Vector(1.1, 0.14, 0.06));
+    this->emissionPoint[1]->setRelCoor(Vector(1.1, -.06, 0.14));
+    this->emissionPoint[2]->setRelCoor(Vector(1.1, 0.06, -.14));
+
+
+//   Animation3D* animB0Shoot = this->getAnimation(WS_SHOOTING0, this->objComp[0][0]);
 //   Animation3D* animB1Shoot = this->getAnimation(WS_SHOOTING1, this->objComp2);
 //   Animation3D* animB2Shoot = this->getAnimation(WS_SHOOTING2, this->objComp3);
-//   Animation3D* animT0Shoot = this->getAnimation(WS_SHOOTING3, this->objComp4);
+//   Animation3D* animT0Shoot = this->getAnimation(WS_SHOOTING3, this->objComp[0][1]);
 //   Animation3D* animT1Shoot = this->getAnimation(WS_SHOOTING4, this->objComp5);
 //   Animation3D* animT2Shoot = this->getAnimation(WS_SHOOTING5, this->objComp6);
 
-  animB0Shoot->setInfinity(ANIM_INF_CONSTANT);
+
+//   this->shootAnim[0][0]->setInfinity(ANIM_INF_CONSTANT);
 //   animB1Shoot->setInfinity(ANIM_INF_CONSTANT);
 //   animB2Shoot->setInfinity(ANIM_INF_CONSTANT);
@@ -92 +118 @@
 //   animT2Shoot->setInfinity(ANIM_INF_CONSTANT);
 
-  animB0Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
-  animB0Shoot->addKeyFrame(Vector(-0.1, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animB0Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
-/*
-  animT0Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
-  animT0Shoot->addKeyFrame(Vector(-0.04, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animT0Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);*/
-/*
-  animB1Shoot->addKeyFrame(Vector(0.1, 0.0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
-  animB1Shoot->addKeyFrame(Vector(-0.1, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animB1Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);
-
-  animT1Shoot->addKeyFrame(Vector(0.04, 0.0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
-  animT1Shoot->addKeyFrame(Vector(-0.04, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animT1Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);
-
-  animB2Shoot->addKeyFrame(Vector(0.1, 0.0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
-  animB2Shoot->addKeyFrame(Vector(-0.1, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animB2Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);
-
-  animT2Shoot->addKeyFrame(Vector(0.04, 0.0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
-  animT2Shoot->addKeyFrame(Vector(-0.04, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animT2Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);*/
+  for (int i = 0; i < this->getBarrels(); i++){
+    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][0]->addKeyFrame(Vector(-0.3, 0.0, 0.0), Quaternion(), 1.0, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.4, ANIM_LINEAR, ANIM_NULL);
+
+    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][1]->addKeyFrame(Vector(-0.4, 0.0, 0.0), Quaternion(), 1.0, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.4, ANIM_LINEAR, ANIM_NULL);
+  }
 
   Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);
@@ -122 +134 @@
   animation3->setInfinity(ANIM_INF_CONSTANT);
 
-  this->setEmissionPoint(3.8, 1.2, 0, 0);
+//   this->setEmissionPoint(3.8, 1.2, 0, 0);
 
   animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
@@ -140 +152 @@
   // set the owner
   pj->setOwner(this->getOwner());
-
   pj->setParent(PNode::getNullParent());
 
@@ -147 +158 @@
   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));
 
-  pj->setAbsCoor(this->getEmissionPoint(0));
+  pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
+//   pj->setAbsCoor(this->getEmissionPoint(0));
   pj->setAbsDir(this->getAbsDir());
-  pj->toList(OM_GROUP_01_PROJ);
+//   pj->toList(OM_GROUP_01_PROJ);
   pj->activate();
+
+  // initiate animation
+  for (int i = 0; i < this->getSegs(); i++)
+    this->shootAnim[this->activeBarrel][i]->replay();
+
+  // switch barrel
+  this->activeBarrel = (this->activeBarrel + 1) % this->getBarrels();
 }
 
@@ -167 +186 @@
 }
 
+
 void HeavyBlaster::draw() const
 {
@@ -175 +195 @@
                 this->getAbsCoor ().z);
 
+  if (this->leftRight == W_LEFT)
+    glScalef(1.0, 1.0, -1.0);
+
   static_cast<StaticModel*>(this->getModel())->draw(6);
 
   glPushMatrix();
-    glTranslatef (this->objComp1->getAbsCoor().x, this->objComp1->getAbsCoor().y, this->objComp1->getAbsCoor().z);
+    glTranslatef (this->objComp[0][0]->getAbsCoor().x, this->objComp[0][0]->getAbsCoor().y, this->objComp[0][0]->getAbsCoor().z);
     static_cast<StaticModel*>(this->getModel())->draw(1);
-    static_cast<StaticModel*>(this->getModel())->draw(2);
-    static_cast<StaticModel*>(this->getModel())->draw(0);
-
-    glPushMatrix();
-      glTranslatef (this->objComp4->getAbsCoor().x, this->objComp4->getAbsCoor().y, this->objComp4->getAbsCoor().z);
-      static_cast<StaticModel*>(this->getModel())->draw(4);
-      static_cast<StaticModel*>(this->getModel())->draw(5);
-      static_cast<StaticModel*>(this->getModel())->draw(3);
-    glPopMatrix();
-  glPopMatrix();
-/*
-  glPushMatrix();
-  glTranslatef (this->objComp2->getAbsCoor().x, this->objComp2->getAbsCoor().y, this->objComp2->getAbsCoor().z);
+  glPopMatrix();
+
+  glPushMatrix();
+  glTranslatef (this->objComp[1][0]->getAbsCoor().x, this->objComp[1][0]->getAbsCoor().y, this->objComp[1][0]->getAbsCoor().z);
   static_cast<StaticModel*>(this->getModel())->draw(2);
   glPopMatrix();
 
   glPushMatrix();
-  glTranslatef (this->objComp3->getAbsCoor().x, this->objComp3->getAbsCoor().y, this->objComp3->getAbsCoor().z);
+  glTranslatef (this->objComp[2][0]->getAbsCoor().x, this->objComp[2][0]->getAbsCoor().y, this->objComp[2][0]->getAbsCoor().z);
   static_cast<StaticModel*>(this->getModel())->draw(0);
-  glPopMatrix();*/
-
-//   glPushMatrix();
-//   glTranslatef (this->objComp4->getAbsCoor().x, this->objComp4->getAbsCoor().y, this->objComp4->getAbsCoor().z);
-//   static_cast<StaticModel*>(this->getModel())->draw(4);
-//   static_cast<StaticModel*>(this->getModel())->draw(5);
-//   static_cast<StaticModel*>(this->getModel())->draw(3);
-//   glPopMatrix();
-/*
-  glPushMatrix();
-  glTranslatef (this->objComp5->getAbsCoor().x, this->objComp5->getAbsCoor().y, this->objComp5->getAbsCoor().z);
+  glPopMatrix();
+
+  glPushMatrix();
+  glTranslatef (this->objComp[0][1]->getAbsCoor().x, this->objComp[0][1]->getAbsCoor().y, this->objComp[0][1]->getAbsCoor().z);
+    static_cast<StaticModel*>(this->getModel())->draw(4);
+  glPopMatrix();
+
+  glPushMatrix();
+  glTranslatef (this->objComp[1][1]->getAbsCoor().x, this->objComp[1][1]->getAbsCoor().y, this->objComp[1][1]->getAbsCoor().z);
   static_cast<StaticModel*>(this->getModel())->draw(5);
   glPopMatrix();
 
   glPushMatrix();
-  glTranslatef (this->objComp6->getAbsCoor().x, this->objComp6->getAbsCoor().y, this->objComp6->getAbsCoor().z);
+  glTranslatef (this->objComp[2][1]->getAbsCoor().x, this->objComp[2][1]->getAbsCoor().y, this->objComp[2][1]->getAbsCoor().z);
   static_cast<StaticModel*>(this->getModel())->draw(3);
-  glPopMatrix();*/
-
-  glPopMatrix();
-}
+  glPopMatrix();
+
+  glPopMatrix();
+}

branches/playability/src/world_entities/weapons/heavy_blaster.h

@@ -4 +4 @@
 
 #include "weapon.h"
+
+#define    W_LEFT        0
+#define    W_RIGHT       1
 
 /**
@@ -14 +17 @@
   //ObjectListDeclaration(HeavyBlaster);
   public:
-    HeavyBlaster();
+    HeavyBlaster(int leftRight);
     HeavyBlaster (const TiXmlElement* root);
     virtual ~HeavyBlaster();
 
-    void init();
+    void init(int leftRight);
     virtual void loadParams(const TiXmlElement* root);
 
@@ -29 +32 @@
 
   private:
-    PNode* objComp1;
-    PNode* objComp2;
-    PNode* objComp3;
-    PNode* objComp4;
-    PNode* objComp5;
-    PNode* objComp6;
+    PNode*** objComp;
+    Animation3D*** shootAnim;
+    PNode** emissionPoint;
+
+    int activeBarrel;
+
+    int leftRight;
 };
 

branches/playability/src/world_entities/weapons/light_blaster.cc

@@ -45 +45 @@
 {
 
-  this->loadModel("models/guns/plasmadriver_#.obj", 1.0);
+  this->loadModel("models/guns/gattling.obj", 0.333);
   
 
@@ -66 +66 @@
   this->prepareProjectiles(100);
 
+  this->setBarrels(3);
+  this->setSegs(1);
+  this->activeBarrel = 0;
+
+  this->objComp = new PNode**[this->getBarrels()];
+  this->emissionPoint = new PNode*[this->getBarrels()];
+  this->shootAnim = new Animation3D**[this->getBarrels()];
+  for (int i = 0; i < this->getBarrels(); i++)
+  {
+    this->objComp[i] = new PNode* [this->getSegs()];
+    this->emissionPoint[i] = new PNode;
+    this->emissionPoint[i]->setParent(this);             //< One EmissionPoint, that is a PNode connected to the weapon. You can set this to the exitting point of the Projectiles
+    this->emissionPoint[i]->setName("EmissionPoint");
+    this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+    this->shootAnim[i] = new Animation3D* [this->getSegs()];
+    for(int j = 0; j < this->getSegs(); j++)
+    {
+      this->objComp[i][j] = new PNode;
+      this->shootAnim[i][j] = new Animation3D(this->objComp[i][j]);
+      this->shootAnim[i][j]->setInfinity(ANIM_INF_CONSTANT);
+    }
+  }
+
+  for (int i = 0; i < this->getBarrels(); i++ )
+    this->emissionPoint[i]->setRelCoor(Vector(1.19, 0.0, 0.1));
+
+//   Animation3D* animation1 = this->getAnimation(WS_SHOOTING, this);
   Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);
   Animation3D* animation3 = this->getAnimation(WS_DEACTIVATING, this);
 
+//   animation1->setInfinity(ANIM_INF_CONSTANT);
   animation2->setInfinity(ANIM_INF_CONSTANT);
   animation3->setInfinity(ANIM_INF_CONSTANT);
 
-  this->setEmissionPoint(3.8, 1.2, 0);
+//   this->setEmissionPoint(3.8, 1.2, 0);
+
+  for (int i = 0; i < this->getBarrels(); i++){
+    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(0, 0, 0), 0.05, ANIM_NULL, ANIM_LINEAR);
+    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(120, 0, 0), 0.0, ANIM_NULL, ANIM_LINEAR);
+  }
+
 
   animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
@@ -96 +130 @@
   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*180);
 
-  pj->setAbsCoor(this->getEmissionPoint());
+  pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
   pj->setAbsDir(this->getAbsDir());
-  pj->toList(OM_GROUP_01_PROJ);
+//   pj->toList(OM_GROUP_01_PROJ);
   pj->activate();
+
+  for (int i = 0; i < this->getSegs(); i++)
+    this->shootAnim[this->activeBarrel][i]->replay();
+
+  // switch barrel
+  this->activeBarrel = (this->activeBarrel + 1) % this->getBarrels();
 }
 
@@ -118 +158 @@
 void LightBlaster::draw() const
 {
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+    glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+    Vector tmpRot = this->getAbsDir().getSpacialAxis();
+    glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+    static_cast<StaticModel*>(this->getModel())->draw();
+  glPopMatrix();
 }

branches/playability/src/world_entities/weapons/light_blaster.h

@@ -28 +28 @@
     virtual void draw() const;
 
+  private:
+    PNode*** objComp;
+    Animation3D*** shootAnim;
+
+    PNode** emissionPoint;
+
+    int activeBarrel;
 };
 

branches/playability/src/world_entities/weapons/weapon.cc

@@ -124 +124 @@
   this->segs = 1;
 
+  this->shootAnim = new Animation3D**[this->getBarrels()];
+  for (int i = 0; i < this->getBarrels(); i++)
+    this->shootAnim[i] = new Animation3D* [this->getSegs()];
+
   this->emissionPoint = new PNode*[this->barrels];
   for(int i = 0; i < this->barrels; i++){
@@ -150 +154 @@
   // set this object to be synchronized over network
   //this->setSynchronized(true);
+}
+
+/**
+ * needed, if there are more than one barrel or segments
+ */
+void Weapon::init2() 
+{
+  if (this->barrels == 1 && this->segs == 1)
+    return;
+
+  delete this->emissionPoint[0];
+  delete this->emissionPoint;
+  delete this->shootAnim[0];
+  delete this->shootAnim;
+
+  this->shootAnim = new Animation3D**[this->barrels];
+  this->emissionPoint = new PNode*[this->barrels];
+  for(int i = 0; i < this->barrels; i++){
+    this->emissionPoint[i] = new PNode;
+    this->emissionPoint[i]->setParent(this);             //< One EmissionPoint, that is a PNode connected to the weapon. You can set this to the exitting point of the Projectiles
+    this->emissionPoint[i]->setName("EmissionPoint");
+    this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
+    this->shootAnim[i] = new Animation3D* [this->segs];
+  }
+}
+
+/**
+ * deconstructor for init2
+ */
+void Weapon::deconstr()
+{
+  for(int i = 0; i < this->barrels; i++) {
+    delete this->emissionPoint[i];
+    for (int j = 0; j < this->segs; j++)
+      delete this->shootAnim[i][j];
+    delete this->shootAnim[i];
+  }
+
+  delete this->emissionPoint;
+  delete this->shootAnim;
 }
 
@@ -327 +371 @@
 }
 
-Animation3D* Weapon::getAnimation(ShootingStates state, PNode* node)
-{
-  if (state >= WS_SS_MAX) // if the state is not known
+Animation3D* Weapon::getAnimation(int barrel, int seg, PNode* node)
+{
+  if (barrel >= this->getBarrels() || seg >= this->getSegs()) // if the state is not known
     return NULL;
 
-  if (unlikely(this->animation[state] == NULL)) // if the animation does not exist yet create it.
+  if (unlikely(this->shootAnim[barrel][seg] == NULL)) // if the animation does not exist yet create it.
   {
     if (likely(node != NULL))
-      return this->animation[state] = new Animation3D(node);
+      return this->shootAnim[barrel][seg] = new Animation3D(node);
     else
     {
@@ -343 +387 @@
   }
   else
-    return this->animation[state];
+    return this->shootAnim[barrel][seg];
 }
 

branches/playability/src/world_entities/weapons/weapon.h

@@ -55 +55 @@
   WS_STATE_COUNT  =     8     //!< This must match the count of enumerations-members.
 } WeaponState;
-
-typedef enum
-{
-  WS_SHOOTING0    = 0x00000001, //!< Fireing 1st Barrel
-  WS_SHOOTING1    = 0x00000002, //!< Fireing 2nd Barrel
-  WS_SHOOTING2    = 0x00000004, //!< Fireing 3rd Barrel
-  WS_SHOOTING3    = 0x00000008, //!< Fireing 4st Barrel
-  WS_SHOOTING4    = 0x00000010, //!< Fireing 5st Barrel
-  WS_SHOOTING5    = 0x00000020, //!< Fireing 6st Barrel
-  WS_SHOOTING6    = 0x00000040, //!< Fireing 7st Barrel
-  WS_SHOOTING7    = 0x00000080, //!< Fireing 8st Barrel
-
-  WS_SS_MAX       = 0x000000ff
-}ShootingStates;
 
 //! an enumerator defining capabilities of a WeaponSlot
@@ -177 +163 @@
 
     Animation3D* getAnimation(WeaponState state, PNode* node = NULL);
-    Animation3D* getAnimation(ShootingStates state, PNode* node = NULL);
+    Animation3D* getAnimation(int barrel, int seg, PNode* node);
     Animation3D* copyAnimation(WeaponState from, WeaponState to);
 
@@ -190 +176 @@
     void debug() const;
 
-    
+    inline int getBarrels() {return this->barrels; };
+    inline int getSegs() { return this->segs; };
+    inline void setBarrels(int barrels) { this->barrels = barrels; };
+    inline void setSegs(int segs) { this->segs = segs; };
+
+    inline Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; };
+    inline void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); };
+
+    void init2();
+    void deconstr();
 
   protected:
@@ -208 +203 @@
 
 
-    inline int getBarrels() {return this->barrels; };
-    inline int getSeg() {return this->segs; };
-    inline void setBarrels(int barrels) { this->barrels = barrels; };
-    inline void setSegs(int segs) { this->segs = segs; };
 
   private:
@@ -268 +259 @@
     int                    barrels;                         //!< # of barrels
     int                    segs;                             //!< # of segments, one barrel has
+    Animation3D***         shootAnim;
+
   };