Changeset 10037 in orxonox.OLD

Timestamp:

Dec 10, 2006, 1:51:44 PM (17 years ago)

Author:

nicolasc

Message:

added some comments
made swarm missile spin

Location:

branches/playability/src/world_entities

Files:

• projectiles/swarm_projectile.cc (modified) (5 diffs)
• projectiles/swarm_projectile.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (2 diffs)
• weapons/swarm_launcher.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (1 diff)

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

@@ -38 +38 @@
 
 /*  this->loadModel("models/projectiles/orx-rocket.obj", 0.5);*/
-  this->loadModel("models/projectiles/swarm_projectile.obj");
+  this->loadModel("models/projectiles/swarm_projectile.obj"); // no double rescale (see draw())
   this->loadExplosionSound("sound/explosions/explosion_4.wav");
 
@@ -51 +51 @@
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI, M_PI);
+
+  this->rotationSpeed = 100;
+  this->angle = 0;
 }
 
@@ -214 +217 @@
     velocity *= maxVelocity / velocity.len(); // set speed to max
 
+
   this->shiftCoor(velocity * time);
 
   if(this->tickLifeCycle(time))
     this->deactivate();
+
+  this->updateAngle(time);
 }
 
@@ -239 +245 @@
 }
 
+void SwarmProjectile::updateAngle(float time)
+{
+  this->angle += this->rotationSpeed * time;
+}
 
 void SwarmProjectile::draw () const
@@ -247 +257 @@
   float matrix[4][4];
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+  glRotatef(this->angle, 1.0f, 0.0f, 0.0f); //spinning missile
   this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);
-  //glScalef(2.0, 2.0, 2.0);
+  //glScalef(2.0, 2.0, 2.0);  // no double rescale
   this->getModel()->draw();
 

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

@@ -51 +51 @@
     Vector newDirection(Vector curDirection, Vector estTargetDir, float angle);
 
+    // spinning missle
+    void updateAngle(float time);
+    float                             rotationSpeed;
+    float                             angle;
 };
 

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

@@ -511 +511 @@
     bFire = bSecFire = false;
 
+  // fire reqeust/release for primary weapons
   if( this->bFire)
     this->weaponMan.fire();
@@ -516 +517 @@
     this->weaponMan.releaseFire();
 
+  // fire reqeust/release for secondary weapons
   if( this->bSecFire)
     this->secWeaponMan.fire();

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

@@ -91 +91 @@
 
   this->setEmissionPoint(1.684, 0.472, 0);
-  //this->getProjectileFactory()->prepare(100);
+  this->getProjectileFactory()->prepare(5);
 
-  this->setActionSound(WA_SHOOT, "sound/explosions/explosion_3.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");

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

@@ -352 +352 @@
   if (likely(this->isActive()))
   {
+    /** Disabled for releaseFire() from WM*/
     //if (this->requestedAction != WA_NONE)
     //  return;