Changeset 10133 in orxonox.OLD for branches/playability

Timestamp:

Dec 20, 2006, 7:45:55 PM (18 years ago)

Author:

nicolasc

Message:

animation in heavy blaster

Location:

branches/playability/src

Files:

• lib/graphics/importer/objModel.cc (modified) (1 diff)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)
• world_entities/weapons/heavy_blaster.cc (modified) (3 diffs)
• world_entities/weapons/heavy_blaster.h (modified) (1 diff)

branches/playability/src/lib/graphics/importer/objModel.cc

@@ -139 +139 @@
         }
       // case group
-      else if (!strncmp(buffer, "g ", 2))
+      else if (!strncmp(buffer, "g ", 2) || !strncmp(buffer, "o ", 2))
         {
           this->addGroup (buffer+2);

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

@@ -185 +185 @@
 
   
-  this->weaponMan.changeWeaponConfig(1);
+  this->weaponMan.changeWeaponConfig(2);
   this->secWeaponMan.changeWeaponConfig(0);
 
@@ -282 +282 @@
   this->weaponMan.setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
 
-  this->weaponMan.setSlotPosition(4, Vector(-1.5, 0, .5));
+  this->weaponMan.setSlotPosition(4, Vector(1.5, 0, .5));
   this->weaponMan.setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
 
-  this->weaponMan.setSlotPosition(5, Vector(-1.5, 0, -.5));
+  this->weaponMan.setSlotPosition(5, Vector(1.5, 0, -.5));
   this->weaponMan.setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
 

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

@@ -48 +48 @@
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->loadModel("models/guns/plasmadriver_#.obj", 1.0);
+  this->loadModel("models/guns/fragcannon.obj", .4);
   
 
@@ -68 +68 @@
   this->prepareProjectiles(5);
 
+  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_SHOOTING, this->objComp1);
+  Animation3D* animB1Shoot = this->getAnimation(WS_SHOOTING, this->objComp2);
+  Animation3D* animB2Shoot = this->getAnimation(WS_SHOOTING, this->objComp3);
+  Animation3D* animT0Shoot = this->getAnimation(WS_SHOOTING, this->objComp4);
+  Animation3D* animT1Shoot = this->getAnimation(WS_SHOOTING, this->objComp5);
+  Animation3D* animT2Shoot = this->getAnimation(WS_SHOOTING, this->objComp6);
+
+  animB0Shoot->setInfinity(ANIM_INF_CONSTANT);
+  animB1Shoot->setInfinity(ANIM_INF_CONSTANT);
+  animB2Shoot->setInfinity(ANIM_INF_CONSTANT);
+  animT0Shoot->setInfinity(ANIM_INF_CONSTANT);
+  animT1Shoot->setInfinity(ANIM_INF_CONSTANT);
+  animT2Shoot->setInfinity(ANIM_INF_CONSTANT);
+
+  animB0Shoot->addKeyFrame(Vector(0.1, 0.0, 0.0), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+  animB0Shoot->addKeyFrame(Vector(-0.1, 0.0, 0.0), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+  animB0Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);
+
+  animT0Shoot->addKeyFrame(Vector(0.14, 0.0, 0.0), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+  animT0Shoot->addKeyFrame(Vector(-0.14, 0.0, 0.0), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+  animT0Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);
+
+  animB1Shoot->addKeyFrame(Vector(0.1, 0.0, 0.0), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+  animB1Shoot->addKeyFrame(Vector(-0.1, 0.0, 0.0), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+  animB1Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);
+
+  animT1Shoot->addKeyFrame(Vector(0.14, 0.0, 0.0), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+  animT1Shoot->addKeyFrame(Vector(-0.14, 0.0, 0.0), Quaternion(), 0.2, 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.2, ANIM_LINEAR, ANIM_NULL);
+  animB2Shoot->addKeyFrame(Vector(-0.1, 0.0, 0.0), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+  animB2Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);
+
+  animT2Shoot->addKeyFrame(Vector(0.14, 0.0, 0.0), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+  animT2Shoot->addKeyFrame(Vector(-0.14, 0.0, 0.0), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+  animT2Shoot->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);
+
   Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);
   Animation3D* animation3 = this->getAnimation(WS_DEACTIVATING, this);
@@ -121 +166 @@
 void HeavyBlaster::draw() const
 {
-}
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  glTranslatef (this->getAbsCoor ().x,
+                this->getAbsCoor ().y,
+                this->getAbsCoor ().z);
+
+  static_cast<StaticModel*>(this->getModel())->draw(6);
+
+  glPushMatrix();
+  glTranslatef (this->objComp1->getAbsCoor().x, this->objComp1->getAbsCoor().y, this->objComp1->getAbsCoor().z);
+  static_cast<StaticModel*>(this->getModel())->draw(1);
+  static_cast<StaticModel*>(this->getModel())->draw(2);
+  static_cast<StaticModel*>(this->getModel())->draw(0);
+  glPopMatrix();
+/*
+  glPushMatrix();
+  glTranslatef (this->objComp2->getAbsCoor().x, this->objComp2->getAbsCoor().y, this->objComp2->getAbsCoor().z);
+  static_cast<StaticModel*>(this->getModel())->draw(2);
+  glPopMatrix();
+
+  glPushMatrix();
+  glTranslatef (this->objComp3->getAbsCoor().x, this->objComp3->getAbsCoor().y, this->objComp3->getAbsCoor().z);
+  static_cast<StaticModel*>(this->getModel())->draw(0);
+  glPopMatrix();*/
+/*
+  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);
+  static_cast<StaticModel*>(this->getModel())->draw(5);
+  glPopMatrix();
+
+  glPushMatrix();
+  glTranslatef (this->objComp6->getAbsCoor().x, this->objComp6->getAbsCoor().y, this->objComp6->getAbsCoor().z);
+  static_cast<StaticModel*>(this->getModel())->draw(3);
+  glPopMatrix();*/
+
+  glPopMatrix();
+}

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

@@ -28 +28 @@
     virtual void draw() const;
 
+  private:
+    PNode* objComp1;
+    PNode* objComp2;
+    PNode* objComp3;
+    PNode* objComp4;
+    PNode* objComp5;
+    PNode* objComp6;
 };