Changeset 10603 in orxonox.OLD for branches/cleanup/src

Timestamp:

Mar 27, 2007, 7:09:52 PM (18 years ago)

Author:

nicolasc

Message:

minor improments

Location:

branches/cleanup/src/world_entities

Files:

• projectiles/mbolt.cc (modified) (1 diff)
• projectiles/projectile_weapon.h (modified) (1 diff)
• projectiles/swarm_projectile.cc (modified) (5 diffs)
• projectiles/swarm_projectile.h (modified) (3 diffs)
• weapons/swarm_launcher.cc (modified) (1 diff)

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

@@ -82 +82 @@
   //this->trail->setParent( this);
   this->trail->setTexture( "textures/laser.png");
-  this->trail->setAbsCoor(this->getAbsCoor() - Vector(.7,0,0));
+//   this->trail->setAbsCoor(this->getAbsCoor() - Vector(.7,0,0));
+  this->trail->setAbsCoor(this->getAbsCoor() - this->getVelocity().getNormalized() * .7);
 
 }

branches/cleanup/src/world_entities/projectiles/projectile_weapon.h

@@ -1 +1 @@
 /*!
  * @file projectile_weapon.h
- * a projectile_weapon, that is been shooted by a weapon
+ * a projectile_weapon is a projetile fireing projectile. 
  *
- * You can use this class to make some ProjectileWeapons/Bullets/Lasers/Rockets/etc.
+ * You can use this class to make some Multi-Stage Projectiles.
+ * See Spike_Ball for an implemeted example.
  *
  */

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

@@ -57 +57 @@
   this->elecDamage = 0;
 
-  this->trail = new Trail(2.5,4,.2, this);
-  //this->trail->setParent( this);
+  this->trail = new Trail(2.5, 4, .2, this);
   this->trail->setTexture( "textures/laser.png");
-  
-  this->maxVelocity = 300;
-
-  this->rotationSpeed = 360;
+
+//   this->maxVelocity = 300;
+
+  this->smoke = new Trail(20, 10, .3, this);
+  this->smoke->setTexture ("textures/engine.png");
+
   this->angle = 0;
+
 
 
@@ -86 +88 @@
   // delete this->emitter;
   delete this->trail;
+  delete this->smoke;
 }
 
@@ -116 +119 @@
   this->setHealth(10.0* (float)rand()/(float)RAND_MAX);
 
-  this->maxVelocity = 300;
-
-  this->rotationSpeed = 360;
+//   this->maxVelocity = 300;
+
+//   this->rotationSpeed = 360;
   this->angle = 0;
 
@@ -219 +222 @@
 
   this->trail->tick(time);
+  this->smoke->tick(time);
 
   this->angle += this->rotationSpeed * time;
@@ -278 +282 @@
   glTranslatef(-.9,0,0);
   this->trail->draw();
+  glTranslatef( -1.1, 0, 0);
+  this->smoke->draw();
   glPopMatrix();
 }

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

@@ -1 +1 @@
 /*!
  * @file swarm_projectile.h
- * @brief a SwarmProjectile Projectile
+ * @brief a Swarm_Missile Projectile
 */
 
@@ -40 +40 @@
 
     Trail*                            trail;
+    Trail*                            smoke;
 
     ParticleEmitter*                  emitter;
     float                             agility;
-    float                             maxVelocity;
+    const static float                maxVelocity = 100;
     float                             speed;
     Vector                            diffVector ;
@@ -57 +58 @@
 
     // spinning missle
-    float                             rotationSpeed;
+    const static float                rotationSpeed = 360;
     float                             angle;
 };

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

@@ -98 +98 @@
   this->setProjectileTypeC("SwarmProjectile");
 
-  this->loadModel("models/guns/turret1.obj", 1.0);
+//   this->loadModel("models/guns/turret1.obj", 1.0);
 
   this->setEmissionPoint(1.684, 0.472, 0);
-  this->getProjectileFactory()->prepare(50);
+  this->getProjectileFactory()->prepare(10);
 
   this->setActionSound(WA_SHOOT, "sounds/explosions/explosion_1.wav");
-  this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
+//   this->setActionSound(WA_ACTIVATE, "sounds/voices/rockets.wav");
 //   this->setActionSound(WA_RELOAD, "sounds/voices/reload.wav");