Changeset 10618 in orxonox.OLD for trunk/src/world_entities/projectiles/swarm_projectile.cc

Timestamp:

Apr 4, 2007, 12:13:53 PM (17 years ago)

Author:

bknecht

Message:

merged cleanup into trunk (only improvements)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/world_entities/projectiles/swarm_projectile.cc (modified) (6 diffs)

trunk

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

trunk/src/world_entities/projectiles/swarm_projectile.cc

@@ -39 +39 @@
 SwarmProjectile::SwarmProjectile () : Projectile()
 {
-
-/*  this->loadModel("models/projectiles/orx-rocket.obj", 0.5);*/
-  this->loadModel("models/projectiles/swarm_projectile.obj", .25); // no double rescale (see draw())
+  this->loadModel("models/projectiles/swarm_projectile.obj", .333); // no double rescale (see draw())
   this->loadExplosionSound("sounds/explosions/explosion_4.wav");
 
@@ -59 +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->smoke = new Trail(20, 10, .3, this);
+  this->smoke->setTexture ("textures/engine.png");
+
+  this->angle = 0;
+
 
 
@@ -83 +88 @@
   // delete this->emitter;
   delete this->trail;
+  delete this->smoke;
 }
 
@@ -113 +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;
 
@@ -216 +222 @@
 
   this->trail->tick(time);
+  this->smoke->tick(time);
 
   this->angle += this->rotationSpeed * time;
+
   while (this->angle > 360)
+  {
     this->angle -= 360;
+  }
 
   this->lastDir = this->curDir;
@@ -272 +282 @@
   glTranslatef(-.9,0,0);
   this->trail->draw();
+  glTranslatef( -1.1, 0, 0);
+  this->smoke->draw();
   glPopMatrix();
 }

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs