Changeset 10196 in orxonox.OLD

Timestamp:

Jan 8, 2007, 9:46:13 PM (17 years ago)

Author:

nicolasc

Message:

just another upload
GUI seems to work, but there are still some unexplainable segfaults

Location:

branches/playability/src/world_entities

Files:

• projectiles/projectile.h (modified) (1 diff)
• projectiles/spike.cc (modified) (1 diff)
• projectiles/spike.h (modified) (1 diff)
• projectiles/spike_ball.cc (modified) (3 diffs)
• projectiles/spike_ball.h (modified) (2 diffs)
• projectiles/swarm_projectile.cc (modified) (2 diffs)
• space_ships/space_ship.cc (modified) (3 diffs)
• weapons/spike_launcher.cc (modified) (7 diffs)
• weapons/spike_thrower.cc (modified) (1 diff)

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

@@ -87 +87 @@
     OrxSound::SoundBuffer  explosionBuffer;
     OrxSound::SoundBuffer  engineBuffer;
-
-//     virtual Vector newDirection(Vector curDirection, Vector estTargetDir, float angle);
 };
 

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

@@ -165 +165 @@
   float matrix[4][4];
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
   glRotatef(angle, 1.0, 0.0, 0.0);
   this->getAbsDir().matrix (matrix);

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

@@ -34 +34 @@
     virtual void draw () const;
 
-
+    inline void setVelocity(Vector velocity) {this->velocity = velocity;}
   private:
     static FastFactory*               fastFactory;

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

@@ -32 +32 @@
 
 #include "weapons/weapon.h"
-
+#include "../weapons/weapon_manager.h"
 
 #include "class_id_DEPRECATED.h"
@@ -65 +65 @@
   this->halo->setSize(2, 2);
   this->halo->setTexture("hbolt_halo.png");
-/*
-//   this->weaponMan = new WeaponManager(dynamic_cast<WorldEntity*>(this));
-  this->weaponMan.setParentEntity(this);
+
+  this->weaponMan = new WeaponManager(dynamic_cast<WorldEntity*>(this));
+  this->weaponMan->setParentEntity(this);
 
   Weapon* cannon = new SpikeLauncher();
   cannon->setName( "SpikeLauncher");
-  this->weaponMan.addWeapon(cannon, 0, 0);
-  this->weaponMan.changeWeaponConfig(0);
-*/
+  this->weaponMan->addWeapon(cannon, 0, 0);
+  this->weaponMan->changeWeaponConfig(0);
+
 
 }
@@ -177 +177 @@
 
   if (this->tickLifeCycle(dt)){
-//     this->blow();
+    this->weaponMan->fire();
     this->deactivate();
   }

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

@@ -11 +11 @@
 
 #include "../weapons/spike_launcher.h"
-#include "../weapons/weapon.h"
-#include "../weapons/weapon_manager.h"
+
+
+#include "extendable.h"
 
 class Vector;
@@ -62 +63 @@
     WorldEntity* hitEntity; // FIXME TEMPORARY
 
-//     WeaponManager                     weaponMan;
+    WeaponManager*                   weaponMan;
 
 };

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

@@ -1 @@
-
 /*
    orxonox - the future of 3D-vertical-scrollers
@@ -187 +186 @@
 void SwarmProjectile::tick (float time)
 {
+  if(unlikely(this->target == NULL)) /** Check whether the target still exists*/
+    this->deactivate();
+
 /*
   Vector targetFarFarAway = this->getAbsCoor() + Vector(100000, 0, 0);

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

@@ -28 +28 @@
 #include "weapons/swarm_launcher.h"
 #include "weapons/spike_launcher.h"
+#include "weapons/spike_thrower.h"
 #include "weapons/boomerang_gun.h"
 #include "weapons/turret.h"
@@ -173 +174 @@
   Weapon* cannon = new SwarmLauncher();
   cannon->setName( "SwarmLauncher");
-  //cannon->setParent( this);
+
+  Weapon* spike = new SpikeLauncher();
+  spike->setName( "SpikeThrower" );
 
 
@@ -195 +198 @@
 
   this->secWeaponMan.addWeapon( cannon, 0, 0);
+  this->secWeaponMan.addWeapon( spike, 1, 1);
 
   

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

@@ -102 +102 @@
   this->size = 2.5;
 
+  this->setEmissionPoint(0.0, 0.0, 0.0);
+
+
   this->spikes = 26;
   this->launcher = new Vector [this->spikes];
@@ -128 +131 @@
   }
 
-//   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");
-  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
-  this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+//   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_1.wav");
+//   this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
+//   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
 
 }
@@ -179 +181 @@
 
   float nx, ny, nz, ca, sa;
+
   nx = v.x;
   ny = v.y;
@@ -187 +190 @@
 // final version below... easier to to cheat with the one above.
 /*
-  nx = this->getParent()->getRotationVector().x
-  ny = this->getParent()->getRotationVector().y
-  nz = this->getParent()->getRotationVector().z
+  nx = this->getParent()->getRotationVector().x;
+  ny = this->getParent()->getRotationVector().y;
+  nz = this->getParent()->getRotationVector().z;
 
   ca = cos (this->getParent()->getAngle());
@@ -212 +215 @@
     this->launcher[i] = Vector (x, y, z);
   }
+
+  for( int i = 0; i < 3 ; i++)
+    delete m[i];
+  delete m;
 }
 
@@ -222 +229 @@
 
   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++)
   {
@@ -230 +236 @@
 
 //     pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*115.0 + VECTOR_RAND(10)));
-    pj->setVelocity(this->launcher[i] * 200.0);
+    pj->setVelocity(this->launcher[i] * 300.0);
 
     pj->setParent(PNode::getNullParent());
     pj->setAbsCoor(this->getAbsCoor() + this->launcher[i] * this->size);
-    pj->setAbsDir(Quaternion(this->launcher[i], 0));
+    pj->setRelDir(0, this->launcher[i].x, this->launcher[i].y, this->launcher[i].z);
+
+    pj->toList(this->getOMListNumber());
     pj->activate();
   }

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

@@ -146 +146 @@
 void SpikeThrower::fire()
 {
-  bool fired  = false;
+  Projectile* pj =  this->getProjectile();
+  if (pj == NULL)
+    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)));
+  // set the owner
+  pj->setOwner(this->getOwner());
 
-      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();
-    }
-  }
-  if( !fired)
-    this->increaseEnergy( this->getProjectile()->getMinEnergy());
+  pj->setParent(PNode::getNullParent());
+
+  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*150);
+  pj->setAbsCoor(this->getEmissionPoint());
+
+  pj->setAbsDir(this->getAbsDir());
+  pj->activate();
 }