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

Timestamp:

Dec 19, 2006, 11:39:59 PM (18 years ago)

Author:

marcscha

Message:

Collision fixes, further additions

File:

• branches/playability/src/world_entities/projectiles/mbolt.cc (modified) (9 diffs)

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

@@ -24 +24 @@
 
 #include "particles/dot_emitter.h"
-#include "particles/box_emitter.h"
 #include "particles/sprite_particles.h"
 
@@ -47 +46 @@
 {
   this->registerObject(this, MBolt::_objectList);
-  this->loadModel("models/projectiles/mbolt.obj");
+  this->loadModel("models/projectiles/mbolt.obj",4);
 
   
@@ -59 +58 @@
 
   //this->emitter = new DotEmitter(1000, 0, 0);
-  this->emitter = new DotEmitter(200, 0, 0);
+  this->emitter = new DotEmitter(50, 0, 0);
   this->emitter->setParent(this);
   this->emitter->setSpread(M_PI,M_PI);
@@ -76 +75 @@
   dynamic_cast<StaticModel*>(this->getModel())->finalize();
 
+  dynamic_cast<StaticModel*>(this->getModel())->rebuild();
+  this->buildObbTree(4);
   
   this->trail = new Trail(6,4,.1, this);
   //this->trail->setParent( this);
   this->trail->setTexture( "maps/laser.png");
-  this->trail->setAbsCoor(this->getAbsCoor() - Vector(1,0,0));
+  this->trail->setAbsCoor(this->getAbsCoor() - Vector(.7,0,0));
 }
 
@@ -110 +111 @@
     MBolt::explosionParticles = new SpriteParticles(1000);
     MBolt::explosionParticles->setName("MBoltExplosionParticles");
-    MBolt::explosionParticles->setLifeSpan(.5, .3);
+    MBolt::explosionParticles->setLifeSpan(.2, .1);
     MBolt::explosionParticles->setRadius(0.0, 10.0);
     MBolt::explosionParticles->setRadius(.5, 6.0);
@@ -126 +127 @@
   this->emitter->setSpread(0);
   this->emitter->setEmissionRate(10.0);
-  this->emitter->setEmissionVelocity(0);
+  this->emitter->setEmissionVelocity(50);
 }
 
@@ -136 +137 @@
   this->lifeCycle = 0.0;
 
-  this->toList(OM_NULL);
-  this->removeNode();
+  //this->toList(OM_NULL);
+  this->toList(OM_DEAD);
+  //this->removeNode();
   MBolt::fastFactory->kill(this);
 }
@@ -145 +147 @@
 {
   PRINTF(0)("MBolt collides pretest\n");
+
   if( entity == NULL)
     return;
@@ -196 +199 @@
   glMultMatrixf((float*)matrix);
 
-  glScalef(0.75, 0.7/4, 0.7/4);  // no double rescale
+  glScalef(0.75/4, 0.7/16, 0.7/16);  // no double rescale
 
   this->mat->select();
   dynamic_cast<StaticModel*>(this->getModel())->draw();
   this->mat->unselect();
-  glScalef(1/.75,4/.7,4/.7);
-  glTranslatef(-4,0,0);
+  glScalef(4/.75,16/.7,16/.7);
+  glTranslatef(-3,0,0);
   this->trail->draw();
   glPopMatrix();
   glPopAttrib();
 
-
-}
-
+}
+