Changeset 6811 in orxonox.OLD for trunk/src

Timestamp:

Jan 28, 2006, 4:02:06 PM (19 years ago)

Author:

bensch

Message:

More stuff in Cannon and Hyperblast

Location:

trunk/src/world_entities

Files:

• projectiles/hyperblast.cc (modified) (7 diffs)
• projectiles/hyperblast.h (modified) (2 diffs)
• space_ships/hover.cc (modified) (1 diff)
• weapons/cannon.cc (modified) (1 diff)
• weapons/hyperblaster.cc (modified) (2 diffs)

trunk/src/world_entities/projectiles/hyperblast.cc

@@ -40 +40 @@
 
   float modelSize = .3;
-  this->loadModel("models/projectiles/orx-hyperblast.obj", .3);
+  this->loadModel("models/projectiles/hyperblast.obj", 5);
 
   this->setMinEnergy(1);
@@ -58 +58 @@
 {
   /* this is normaly done by World.cc by deleting the ParticleEngine */
-  if (Hyperblast::extParticles != NULL && ClassList::getList(CL_HYPERBLAST)->size() <= 1)
-  {
-    Hyperblast::extParticles = NULL;
-  }
   if (Hyperblast::explosionParticles != NULL && ClassList::getList(CL_HYPERBLAST)->size() <= 1)
   {
@@ -69 +65 @@
 }
 
-SpriteParticles* Hyperblast::extParticles = NULL;
 SparkParticles* Hyperblast::explosionParticles = NULL;
 
 void Hyperblast::activate()
 {
-  if (unlikely(Hyperblast::extParticles == NULL))
-  {
-    Hyperblast::extParticles = new SpriteParticles(2000);
-    Hyperblast::extParticles->setName("HyperblastTrailParticles");
-    Hyperblast::extParticles->setMaterialTexture("maps/radial-trans-noise.png");
-    Hyperblast::extParticles->setLifeSpan(1.0, .3);
-    Hyperblast::extParticles->setRadius(0.0, .5);
-    Hyperblast::extParticles->setRadius(0.2, 2.0);
-    Hyperblast::extParticles->setRadius(.5, .8);
-    Hyperblast::extParticles->setRadius(1.0, .8);
-    Hyperblast::extParticles->setColor(0.0, 1,0,0,.7);
-    Hyperblast::extParticles->setColor(0.2, .8,.8,0,.5);
-    Hyperblast::extParticles->setColor(0.5, .8,.8,.8,.8);
-    Hyperblast::extParticles->setColor(1.0, .8,.8,.8,.0);
-  }
   if (unlikely(Hyperblast::explosionParticles == NULL))
   {
@@ -103 +83 @@
   }
 
-  this->emitter->setSystem(Hyperblast::extParticles);
+  this->emitter->setSystem(Hyperblast::explosionParticles);
 
   this->updateNode(0);
-  this->emitter->setEmissionRate(45.0);
+  this->emitter->setEmissionRate(245.0);
   this->emitter->setEmissionVelocity(0.0);
 }
@@ -125 +105 @@
 void Hyperblast::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (this->hitEntity != entity)
-    this->destroy();
-  this->hitEntity = entity;
 }
 
@@ -136 +113 @@
 void Hyperblast::tick (float dt)
 {
-  //Vector v = *this->flightDirection * ( this->speed * time * 1000 + 0.1);
-  Vector v = this->velocity * (dt);
-  this->shiftCoor(v);
-
   if(this->tickLifeCycle(dt))
     this->deactivate();
@@ -150 +123 @@
 {
   PRINTF(5)("DESTROY Hyperblast\n");
-  this->lifeCycle = .95; //!< @todo calculate this usefully.
-  this->emitter->setSystem(Hyperblast::explosionParticles);
 
-  this->emitter->setEmissionRate(1000.0);
-  this->emitter->setEmissionVelocity(50.0);
-//  this->deactivate();
 
 }

trunk/src/world_entities/projectiles/hyperblast.h

@@ -11 +11 @@
 class Vector;
 class Weapon;
-class SpriteParticles;
 class SparkParticles;
 class ParticleEmitter;
@@ -36 +35 @@
   private:
     static FastFactory*               fastFactory;
-    static SpriteParticles*           extParticles;
     static SparkParticles*            explosionParticles;
 

trunk/src/world_entities/space_ships/hover.cc

@@ -76 +76 @@
   Weapon* wpLeft = new TestGun(1);
   wpLeft->setName("testGun Left");
-  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_CANNON));
+  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
 
   cannon->setName("BFG");

trunk/src/world_entities/weapons/cannon.cc

@@ -74 +74 @@
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->loadModel("models/guns/plasmadriver_#.obj", 2.0);
+  this->loadModel("models/guns/cannon.obj", 1.0);
 
   this->setStateDuration(WS_SHOOTING, 2.0);

trunk/src/world_entities/weapons/hyperblaster.cc

@@ -66 +66 @@
   this->setStateDuration(WS_SHOOTING, 2.0);
   this->setStateDuration(WS_RELOADING, 5.0);
-  this->setStateDuration(WS_ACTIVATING, .1);
-  this->setStateDuration(WS_DEACTIVATING, .4);
+  this->setStateDuration(WS_ACTIVATING, .8);
+  this->setStateDuration(WS_DEACTIVATING, .8);
 
   this->setEnergyMax(10);
@@ -97 +97 @@
 //     animation1->addKeyFrame(Vector(0, 0, 0), Quaternion(), 0.0, ANIM_LINEAR, ANIM_NULL);
 
-  animation2->addKeyFrame(Vector(1.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animation2->addKeyFrame(Vector(1.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animation2->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+  animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+  animation2->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL);
 
-  animation3->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animation3->addKeyFrame(Vector(1.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
-  animation2->addKeyFrame(Vector(1.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
+  animation3->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL);
+  animation3->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
 }