Changeset 10170 in orxonox.OLD for branches

Timestamp:

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

Author:

nicolasc

Message:

EOD commit

Location:

branches/playability/src/world_entities

Files:

• WorldEntities.am (modified) (4 diffs)
• projectiles/mbolt.cc (modified) (1 diff)
• projectiles/spike.cc (added)
• projectiles/spike.h (added)
• projectiles/spike_ball.cc (added)
• projectiles/spike_ball.h (added)
• space_ships/space_ship.cc (modified) (2 diffs)
• weapons/heavy_blaster.cc (modified) (2 diffs)
• weapons/light_blaster.cc (modified) (3 diffs)
• weapons/spike_launcher.cc (added)
• weapons/spike_launcher.h (added)

branches/playability/src/world_entities/WorldEntities.am

@@ -41 +41 @@
                 world_entities/weapons/heavy_blaster.cc \
                 world_entities/weapons/swarm_launcher.cc \
+                world_entities/weapons/spike_launcher.cc \
                 \
                 world_entities/projectiles/lbolt.cc \
@@ -54 +55 @@
                 world_entities/projectiles/boomerang_projectile.cc \
                 world_entities/projectiles/hyperblast.cc \
-                world_entities/projectiles/acid_splash.cc \
+                world_entities/projectiles/spike.cc \
+                world_entities/projectiles/spike_ball.cc \
                 \
                 world_entities/power_ups/turret_power_up.cc \
@@ -155 +157 @@
                 weapons/heavy_blaster.h \
                 weapons/swarm_launcher.h \
+                weapons/spike_launcher.h \
                 \
                 projectiles/lbolt.h \
@@ -168 +171 @@
                 projectiles/boomerang_projectile.h \
                 projectiles/hyperblast.h \
-                projectiles/acid_splash.h \
+                projectiles/spike.h \
+                projectiles/spike_ball.h \
                 \
                 power_ups/turret_power_up.h \

branches/playability/src/world_entities/projectiles/mbolt.cc

@@ -55 +55 @@
   this->lifeSpan = 3.0;
   this->angle     = 0;
-
 
   //this->emitter = new DotEmitter(1000, 0, 0);

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

@@ -27 +27 @@
 #include "weapons/heavy_blaster.h"
 #include "weapons/swarm_launcher.h"
+#include "weapons/spike_launcher.h"
 #include "weapons/boomerang_gun.h"
 #include "weapons/turret.h"
@@ -170 +171 @@
   //wpLeft3->setParent( this);
 
-  Weapon* cannon = new SwarmLauncher();
-  cannon->setName( "SwarmLauncher");
+  Weapon* cannon = new SpikeLauncher();
+  cannon->setName( "SpikeLauncher");
   //cannon->setParent( this);
 

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);
   }