Changeset 10180 in orxonox.OLD

Timestamp:

Jan 4, 2007, 10:29:09 PM (17 years ago)

Author:

nicolasc

Message:

bump

Location:

branches/playability/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• projectiles/hbolt.cc (modified) (2 diffs)
• projectiles/hbolt.h (modified) (1 diff)
• projectiles/lbolt.cc (modified) (2 diffs)
• projectiles/lbolt.h (modified) (1 diff)
• projectiles/mbolt.cc (modified) (2 diffs)
• projectiles/mbolt.h (modified) (1 diff)
• projectiles/spike_ball.cc (modified) (2 diffs)
• weapons/spike_launcher.cc (modified) (3 diffs)
• weapons/spike_launcher.h (modified) (1 diff)
• weapons/spike_thrower.cc (added)
• weapons/spike_thrower.h (added)

branches/playability/src/world_entities/WorldEntities.am

@@ -42 +42 @@
                 world_entities/weapons/swarm_launcher.cc \
                 world_entities/weapons/spike_launcher.cc \
+                world_entities/weapons/spike_thrower.cc \
                 world_entities/weapons/acid_launcher.cc \
                 \
@@ -160 +161 @@
                 weapons/swarm_launcher.h \
                 weapons/spike_launcher.h \
+                weapons/spike_thrower.h \
                 weapons/acid_launcher.h \
                 \

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

@@ -113 +113 @@
 }
 
-
+/*
 void HBolt::collidesWith(WorldEntity* entity, const Vector& location)
 {
@@ -122 +122 @@
   dynamic_cast<SpaceShip*>(entity)->damage( this->getPhysDamage(), this->getElecDamage());
   this->deactivate();
-}
+}*/
 
 

branches/playability/src/world_entities/projectiles/hbolt.h

@@ -27 +27 @@
     virtual void deactivate();
 
-    virtual void collidesWith(WorldEntity* entity, const Vector& location);
+//     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
     virtual void destroy (WorldEntity* killer);

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

@@ -115 +115 @@
 }
 
-
+/*
 void LBolt::collidesWith(WorldEntity* entity, const Vector& location)
 {
@@ -124 +124 @@
   dynamic_cast<SpaceShip*>(entity)->damage(this->getDamage(),0);
 //   this->deactivate();
-}
+}*/
 
 /**

branches/playability/src/world_entities/projectiles/lbolt.h

@@ -27 +27 @@
     virtual void deactivate();
 
-    virtual void collidesWith(WorldEntity* entity, const Vector& location);
+//     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
     virtual void destroy (WorldEntity* killer);

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

@@ -141 +141 @@
 }
 
-
+/*
 void MBolt::collidesWith(WorldEntity* entity, const Vector& location)
 {
@@ -157 +157 @@
   //entity->destroy(this);
   //this->deactivate();
-}
+}*/
 
 /**

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

@@ -28 +28 @@
     virtual void deactivate();
 
-    virtual void collidesWith(WorldEntity* entity, const Vector& location);
+//     virtual void collidesWith(WorldEntity* entity, const Vector& location);
 
     virtual void destroy (WorldEntity* killer);

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

@@ -30 +30 @@
 
 #include "space_ships/space_ship.h"
+
+#include "weapons/weapon.h"
 
 
@@ -58 +60 @@
 
   this->angle = 0;
-  this->rotationSpeed = 130;
+  this->rotationSpeed = 0;
 /*
   this->halo = new Billboard();

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

@@ -67 +67 @@
 SpikeLauncher::~SpikeLauncher ()
 {
+  delete this->launcher;
+
   // model will be deleted from WorldEntity-destructor
 }
@@ -95 +97 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("SpikeBall");
+  this->setProjectileTypeC("Spike");
 
-  this->loadModel("models/guns/turret1.obj", 1.0);
+//   this->loadModel("models/guns/turret1.obj", 1.0);
+  this->size = 2.5;
 
-  this->setEmissionPoint(1.684, 0.472, 0);
-  this->getProjectileFactory()->prepare(50);
+  this->spikes = 26;
+  this->launcher = new Vector [this->spikes];
+
+  this->launcher[0] = Vector(1.0, 0.0, 0.0);
+  this->launcher[1] = Vector(0.0, 1.0, 0.0);
+  this->launcher[2] = Vector(0.0, 0.0, 1.0);
+
+  this->launcher[3] = Vector(1.0, 1.0, 0.0);
+  this->launcher[4] = Vector(0.0, 1.0, 1.0);
+  this->launcher[5] = Vector(1.0, 0.0, 1.0);
+  this->launcher[6] = Vector(1.0, -1.0, 0.0);
+  this->launcher[7] = Vector(0.0, 1.0, -1.0);
+  this->launcher[8] = Vector(-1.0, 0.0, 1.0);
+
+  this->launcher[9] = Vector(-1.0, 1.0, 1.0);
+  this->launcher[10] = Vector(1.0, 1.0, 1.0);
+  this->launcher[11] = Vector(1.0, -1.0, 1.0);
+  this->launcher[12] = Vector(-1.0, -1.0, 1.0);
+
+  int tmp = this->spikes / 2;
+  for (int i = 0; i < tmp; i++)
+  {
+    this->launcher[i].normalize();
+    this->launcher[tmp + i] =  this->launcher[i] * (-1);
+  }
+
+//   this->setEmissionPoint(1.684, 0.472, 0);
+  this->getProjectileFactory()->prepare(this->spikes);  //we don't need more...
 
   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
@@ -145 +174 @@
 void SpikeLauncher::fire()
 {
-  bool fired  = false;
+  Projectile* pj = NULL;
+//   for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
+  for (int i = 0; i < this->spikes; i++)
+  {
+    pj  = this->getProjectile();
+    if (pj == NULL) // if true, we do have a problem!!
+      return;
 
-  Projectile* pj = NULL;
-  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
-  {
-    if( ((*eIterator)->getOMListNumber() == OM_GROUP_00) && ((*eIterator)->getClassCName() != "Weapon") && ((*eIterator)->getClassCName() != "Projectile") && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 300)
-    {
-      pj  = this->getProjectile();
-      if (pj == NULL)
-        return;
-      
-      fired = true;
-      pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*115.0 + VECTOR_RAND(10)));
+//     pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*115.0 + VECTOR_RAND(10)));
+    pj->setVelocity(this->launcher[i] * 200.0);
 
-      pj->setParent(PNode::getNullParent());
-      pj->setAbsCoor(this->getEmissionPoint());
-      pj->setAbsDir(this->getAbsDir());
-//       dynamic_cast<SpikeProjectile*>(pj)->setTarget( (PNode*)(*eIterator) );
-      pj->toList(OM_GROUP_01_PROJ);
-      pj->activate();
-    }
+    pj->setParent(PNode::getNullParent());
+    pj->setAbsCoor(this->getAbsCoor() + this->launcher[i] * this->size);
+    pj->setAbsDir(Quaternion(this->launcher[i], 0));
+    pj->activate();
   }
-  if( !fired)
-    this->increaseEnergy( this->getProjectile()->getMinEnergy());
 }

branches/playability/src/world_entities/weapons/spike_launcher.h

@@ -30 +30 @@
 
   private:
+
+  int           spikes;
+  Vector*       launcher;
+  float         size;
   };