Changeset 10188 in orxonox.OLD for branches/playability/src/world_entities/projectiles

Timestamp:

Jan 7, 2007, 2:50:47 PM (18 years ago)

Author:

nicolasc

Message:

updated spikeball/spike combo; still need to turn a projectile into a spaceship
swarmmissile turns again, but flickers

Location:

branches/playability/src/world_entities/projectiles

Files:

• spike_ball.cc (modified) (3 diffs)
• spike_ball.h (modified) (4 diffs)
• swarm_projectile.cc (modified) (2 diffs)

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

@@ -60 +60 @@
 
   this->angle = 0;
-  this->rotationSpeed = 0;
+  this->rotationSpeed = 130;
+
+  this->halo = new Billboard();
+  this->halo->setSize(2, 2);
+  this->halo->setTexture("hbolt_halo.png");
 /*
-  this->halo = new Billboard();
-  this->halo->setSize(.35, .35);
-  this->halo->setTexture("hbolt_halo.png");*/
+//   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);
+*/
+
 }
 
@@ -105 +115 @@
   this->setDamage(5);
   this->setHealth(0);
+  this->rotationVector = VECTOR_RAND(1);
 }
 
@@ -197 +208 @@
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
 
-  glRotatef(angle, 1.0, 0.0, 0.0);
+  glRotatef(angle, this->rotationVector.x, this->rotationVector.y, this->rotationVector.z);
   this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);

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

@@ -9 +9 @@
 #include "projectile.h"
 #include "effects/billboard.h"
+
+#include "../weapons/spike_launcher.h"
 #include "../weapons/weapon.h"
+#include "../weapons/weapon_manager.h"
 
 class Vector;
@@ -16 +19 @@
 class ParticleEmitter;
 class FastFactory;
+class WeaponManager;
+
 
 class SpikeBall : public Projectile
@@ -35 +40 @@
     virtual void draw () const;
 
+    inline Vector getRotationVector() { return this->rotationVector; }
+    inline float getAngle() { return this->angle; }
+
 //     virtual void blow();
 
@@ -48 +56 @@
     float                             angle;
     float                             rotationSpeed;
+    Vector                            rotationVector;
 
     Billboard*                        halo;
 
     WorldEntity* hitEntity; // FIXME TEMPORARY
+
+//     WeaponManager                     weaponMan;
+
 };
 

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

@@ -268 +268 @@
 
   this->angle += this->rotationSpeed * time;
+  while (this->angle > 360)
+    this->angle -= 360;
 
   this->lastDir = this->curDir;
@@ -309 +311 @@
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
   Vector tmpRot = this->getAbsCoor().cross(tmpDir);
-  glRotatef (angleDeg ( this->getAbsCoor(), tmpDir), tmpRot.x, tmpRot.y, tmpRot.z );
+  glRotatef (angleRad ( this->getAbsCoor(), tmpDir), tmpRot.x, tmpRot.y, tmpRot.z );
   glRotatef(this->angle, 1.0f, 0.0f, 0.0f); //spinning missile
   this->getAbsDir().matrix (matrix);