Changeset 10170 in orxonox.OLD for branches/playability/src/world_entities/weapons

Timestamp:

Jan 3, 2007, 4:44:17 PM (18 years ago)

Author:

nicolasc

Message:

EOD commit

Location:

branches/playability/src/world_entities/weapons

Files:

• heavy_blaster.cc (modified) (2 diffs)
• light_blaster.cc (modified) (3 diffs)
• spike_launcher.cc (added)
• spike_launcher.h (added)

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

@@ -35 +35 @@
 HeavyBlaster::~HeavyBlaster()
 {
+  for (int i = 0; i < this->getBarrels(); i++)
+  {
+    for(int j = 0; j < this->getSegs(); j++)
+    {
+      delete this->shootAnim[i][j];
+      delete this->objComp[i][j];
+    }
+    delete this->shootAnim[i];
+    delete this->objComp[i];
+    delete this->emissionPoint[i];
+  }
+
   this->deconstr();
      // model will be deleted from WorldEntity-destructor
@@ -69 +81 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("HBolt");   // FIXME temp project type until the blaste class exist
+ this->setProjectileTypeC("HBolt");   // FIXME temp project type until the blaste class exist
+//   this->setProjectileTypeC("SpikeBall");   // FIXME temp project type until the blaste class exist
   this->prepareProjectiles(5);
 

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

@@ -34 +34 @@
 LightBlaster::~LightBlaster()
 {
+  for (int i = 0; i < this->getBarrels(); i++)
+  {
+    for(int j = 0; j < this->getSegs(); j++)
+    {
+      delete this->shootAnim[i][j];
+      delete this->objComp[i][j];
+    }
+    delete this->shootAnim[i];
+    delete this->objComp[i];
+    delete this->emissionPoint[i];
+  }
+
+  this->deconstr();
       // model will be deleted from WorldEntity-destructor
 }
@@ -64 +77 @@
   //this->setProjectileTypeC("RailProjectile");   // FIXME temp project type until the blaste class exist
   this->setProjectileTypeC("LBolt");   // Working; FIXME: add textures
+//   this->setProjectileTypeC("Spike");   // Working; FIXME: add textures
   this->prepareProjectiles(100);
 
@@ -103 +117 @@
 
   for (int i = 0; i < this->getBarrels(); i++){
-    this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion(0.0, 0.0, 0.0), 0.04, ANIM_NULL, ANIM_LINEAR);
-    this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion(M_2_PI/3.0, 0.0, 0.0), 0.01, ANIM_NULL, ANIM_LINEAR);
+    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);
   }