Changeset 10650 in orxonox.OLD

Timestamp:

May 10, 2007, 3:31:14 PM (17 years ago)

Author:

nicolasc

Message:

updated disruptor

Location:

branches/vs-enhencements/src/world_entities

Files:

• projectiles/hbolt.cc (modified) (1 diff)
• weapons/disruptor.cc (modified) (3 diffs)
• weapons/heavy_blaster.cc (modified) (1 diff)

branches/vs-enhencements/src/world_entities/projectiles/hbolt.cc

@@ -59 +59 @@
   this->halo = new Billboard();
   this->halo->setSize(.65, .65);
-  this->halo->setTexture("hbolt_halo2.jpg");
+  this->halo->setTexture("hbolt_halo2.png");
   this->halo->setVisibility(false);
 

branches/vs-enhencements/src/world_entities/weapons/disruptor.cc

@@ -143 +143 @@
 
 
+  this->shootAnim[0][0]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
+  this->shootAnim[0][0]->addKeyFrame(Vector(-0.5, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
+//   this->shootAnim[0][0]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
+
   Animation3D* animation2 = this->getAnimation(WS_ACTIVATING, this);
   Animation3D* animation3 = this->getAnimation(WS_DEACTIVATING, this);
@@ -173 +177 @@
   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();
+
+  this->shootAnim[0][0]->replay();
+
+
 }
 
@@ -206 +208 @@
     glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  static_cast<StaticModel*>(this->getModel())->draw();
+  //Base
+  static_cast<StaticModel*>(this->getModel())->draw(1);
+
+  // Barrel  glPushMatrix();
+  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(0);
+  glPopMatrix();
 
   glPopMatrix();

branches/vs-enhencements/src/world_entities/weapons/heavy_blaster.cc

@@ -157 +157 @@
 
   for (int i = 0; i < this->getBarrels(); i++){
-    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.05, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.01, ANIM_LINEAR, ANIM_NULL);
     this->shootAnim[i][0]->addKeyFrame(Vector(-0.3, 0.0, 0.0), Quaternion(), 0.9, ANIM_LINEAR, ANIM_NULL);
-    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.55, ANIM_LINEAR, ANIM_NULL);
-
-    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.05, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, 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.2, ANIM_LINEAR, ANIM_NULL);
-    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.25, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
   }