Changeset 10644 in orxonox.OLD for branches/vs-enhencements/src/world_entities/weapons

Timestamp:

Apr 29, 2007, 9:58:18 PM (18 years ago)

Author:

nicolasc

Message:

update "weapon points"
refined the RFCannon

Location:

branches/vs-enhencements/src/world_entities/weapons

Files:

• heavy_blaster.cc (modified) (3 diffs)
• light_blaster.cc (modified) (1 diff)
• rf_cannon.cc (modified) (2 diffs)

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

@@ -156 +156 @@
 
 
-//   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->objComp[0][1]);
-//   Animation3D* animT1Shoot = this->getAnimation(WS_SHOOTING4, this->objComp5);
-//   Animation3D* animT2Shoot = this->getAnimation(WS_SHOOTING5, this->objComp6);
-
-
-//   this->shootAnim[0][0]->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);
-
   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);
@@ -187 +172 @@
   animation3->setInfinity(ANIM_INF_CONSTANT);
 
-//   this->setEmissionPoint(3.8, 1.2, 0, 0);
-
   animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
   animation2->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL);
@@ -207 +190 @@
   pj->setParent(PNode::getNullParent());
 
-//   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
-//   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));
   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));
 
   pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
-//   pj->setAbsCoor(this->getEmissionPoint(0));
   pj->setAbsDir(this->getAbsDir());
-//   pj->toList(OM_GROUP_01_PROJ);
   pj->activate();
 

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

@@ -53 +53 @@
 {
 
-  for (int i = 0; i < this->getBarrels(); i++)
-  {
-   //delete [] this->shootAnim[i];
-   delete [] this->objComp[i];
-  }
-  delete [] this->emissionPoint;
-   //delete [] this->shootAnim;
-   delete [] this->objComp;
+//   for (int i = 0; i < this->getBarrels(); i++)
+//   {
+//    //delete [] this->shootAnim[i];
+//    delete [] this->objComp[i];
+//   }
+//   delete [] this->emissionPoint;
+//    //delete [] this->shootAnim;
+//    delete [] this->objComp;
 
 }

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

@@ -52 +52 @@
 RFCannon::~RFCannon()
 {
-  for (int i = 0; i < this->getBarrels(); i++)
-    delete [] this->objComp[i];
+//   for (int i = 0; i < this->getBarrels(); i++)
+//     delete [] this->objComp[i];
 
-  delete [] this->emissionPoint;
-  delete [] this->objComp;
+//   delete [] this->emissionPoint;
+//   delete [] this->objComp;
 }
 
@@ -132 +132 @@
     pj->setParent(PNode::getNullParent());
 
-    pj->setVelocity(this->getAbsDir().apply(Vector(0,1,0))*190);
+    pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*190);
 
     pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());