Changeset 10600 in orxonox.OLD for branches/cleanup/src/world_entities/weapons/light_blaster.cc

Timestamp:

Mar 5, 2007, 11:37:52 AM (18 years ago)

Author:

nicolasc

Message:

Comestic cleanup in projectiles

File:

• branches/cleanup/src/world_entities/weapons/light_blaster.cc (modified) (3 diffs)

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

@@ -98 +98 @@
   this->objComp = new PNode**[this->getBarrels()];
   this->emissionPoint = new PNode*[this->getBarrels()];
-  this->shootAnim = new Animation3D**[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]->setParent(this);
     this->emissionPoint[i]->setName("EmissionPoint");
     this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
-    this->shootAnim[i] = new Animation3D* [this->getSegs()];
+//     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->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));
+/*
+  this->emissionPoint[0]->setRelCoor(Vector(1.19, 0.0, 0.1));
+  this->emissionPoint[1]->setRelCoor(Vector(1.19, -0.07, -0.05));
+  this->emissionPoint[2]->setRelCoor(Vector(1.19, 0.07, -0.05));*/
+
+  this->emissionPoint[0]->setRelCoor(Vector(2.2, 0.0, 0.1));
+  this->emissionPoint[1]->setRelCoor(Vector(2.2, -0.07, -0.05));
+  this->emissionPoint[2]->setRelCoor(Vector(2.2, 0.07, -0.05));
 
 //   Animation3D* animation1 = this->getAnimation(WS_SHOOTING, this);
@@ -128 +133 @@
 //   this->setEmissionPoint(3.8, 1.2, 0);
 
-  for (int i = 0; i < this->getBarrels(); i++){
-    this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion(i * 120, Vector(1.0, 0.0, 0.0)), 0.049, ANIM_NULL, ANIM_LINEAR);
-    this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion((i+1)*120, Vector(1.0, 0.0, 0.0)), 0.001, ANIM_NULL, ANIM_LINEAR);
-  }
+//   for (int i = 0; i < this->getBarrels(); i++){
+//     this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion(i * 120, Vector(1.0, 0.0, 0.0)), 0.049, ANIM_NULL, ANIM_LINEAR);
+//     this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion((i+1)*120, Vector(1.0, 0.0, 0.0)), 0.001, ANIM_NULL, ANIM_LINEAR);
+//   }
 
 
@@ -160 +165 @@
   pj->activate();
 
-  for (int i = 0; i < this->getSegs(); i++)
-    this->shootAnim[this->activeBarrel][i]->replay();
+//   for (int i = 0; i < this->getSegs(); i++)
+//     this->shootAnim[this->activeBarrel][i]->replay();
 
   // switch barrel