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

Timestamp:

Dec 14, 2006, 10:58:41 AM (18 years ago)

Author:

marcscha

Message:

Update in swarm launcher, swarm missile, mbolt

Location:

branches/playability/src/world_entities/projectiles

Files:

• mbolt.cc (modified) (7 diffs)
• swarm_projectile.cc (modified) (2 diffs)

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

@@ -45 +45 @@
 {
   this->registerObject(this, MBolt::_objectList);
-  this->loadModel("models/projectiles/mbolt.obj",0.25);
+  this->loadModel("models/projectiles/mbolt.obj");
+  
   //this->loadModel("models/projectiles/laser.obj");
 
@@ -55 +56 @@
 
   //this->emitter = new DotEmitter(1000, 0, 0);
-  this->emitter = new BoxEmitter(Vector(8,1,1)*dynamic_cast<StaticModel*>(this->getModel())->getScaleFactor(), 1000, 0, 0);
+  this->emitter = new DotEmitter(200, 0, 0);
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI,M_PI);
@@ -76 +77 @@
 /**
  *  standard deconstructor
-
-/**
-*/
+ *
+ */
 MBolt::~MBolt ()
 {
@@ -104 +104 @@
   if (unlikely(MBolt::trailParticles == NULL))
   {
-    MBolt::trailParticles = new SpriteParticles(3000);
+    MBolt::trailParticles = new SpriteParticles(1000);
     MBolt::trailParticles->setName("BoomerangProjectileTrailParticles");
     MBolt::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
@@ -134 +134 @@
 
   this->emitter->setSpread(0);
-  this->emitter->setEmissionRate(80.0);
+  this->emitter->setEmissionRate(10.0);
   this->emitter->setEmissionVelocity(0);
   this->updateNode(0);
@@ -198 +198 @@
 
   glPushMatrix();
-
   float matrix[4][4];
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
@@ -205 +204 @@
   glMultMatrixf((float*)matrix);
 
-  glScalef(3.0, 0.7, 0.7);  // no double rescale
+  glScalef(0.75, 0.7/4, 0.7/4);  // no double rescale
 
   this->mat->select();

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

@@ -95 +95 @@
     SwarmProjectile::trailParticles->setName("SwarmProjectileTrailParticles");
     SwarmProjectile::trailParticles->setMaterialTexture("maps/radial-trans-noise.png");
-    SwarmProjectile::trailParticles->setLifeSpan(.5, 0);
-    SwarmProjectile::trailParticles->setRadius(0.0, .5);
-    SwarmProjectile::trailParticles->setRadius(0.2, 1.5);
-    SwarmProjectile::trailParticles->setRadius(.5, 1.0);
-    SwarmProjectile::trailParticles->setRadius(1.0, 0.6);
+    SwarmProjectile::trailParticles->setLifeSpan(.3, 0);
+    SwarmProjectile::trailParticles->setRadius(0.0, .7);
+    SwarmProjectile::trailParticles->setRadius(0.2, 1.3);
+    SwarmProjectile::trailParticles->setRadius(.5, .8);
+    SwarmProjectile::trailParticles->setRadius(1.0, 0.3);
     SwarmProjectile::trailParticles->setColor(0.0, 1,0,0,.7);
     SwarmProjectile::trailParticles->setColor(0.2, .8,.8,0,.5);
@@ -123 +123 @@
 
   this->updateNode(0);
-  this->emitter->setEmissionRate(160.0);
+  this->emitter->setEmissionRate(50.0);
   this->emitter->setEmissionVelocity(0.0);
+  this->emitter->setInheritSpeed(0);
 
   this->setHealth(10.0* (float)rand()/(float)RAND_MAX);