Changeset 7001 in orxonox.OLD

Timestamp:

Feb 3, 2006, 2:18:26 AM (18 years ago)

Author:

bensch

Message:

TurbineHover is cool now

Location:

trunk/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (2 diffs)
• space_ship.h (modified) (1 diff)
• turbine_hover.cc (modified) (6 diffs)
• turbine_hover.h (modified) (2 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -287 +287 @@
   Playable::collidesWith(entity, location);
 
-
-  if (entity->isA(CL_TURRET_POWER_UP) && entity != ref)
-  {
-    this->ADDWEAPON();
-    ref = entity;
-  }
-
   if( entity->isA(CL_PROJECTILE) && entity != ref)
   {
@@ -501 +494 @@
 }
 
-#include "weapons/aiming_turret.h"
-// FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
-void SpaceShip::ADDWEAPON()
-{
-  Weapon* turret = NULL;
-
-  if ((float)rand()/RAND_MAX < .9)
-  {
-    //if (this->getWeaponManager()->hasFreeSlot(2, WTYPE_TURRET))
-    {
-      turret = new Turret();
-      this->addWeapon(turret, 2);
-      this->getWeaponManager()->changeWeaponConfig(2);
-    }
-  }
-  else
-  {
-    //if (this->getWeaponManager()->hasFreeSlot(3))
-    {
-      turret = dynamic_cast<Weapon*>(Factory::fabricate(CL_TARGETING_TURRET));
-      if (turret != NULL)
-      this->addWeapon(turret, 3);
-
-      this->getWeaponManager()->changeWeaponConfig(3);
-    }
-  }
-
-  if(turret != NULL)
-  {
-    turret->setName("Turret");
-    turret->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
-  }
-}
 
 #define MASK_bUp         1

trunk/src/world_entities/space_ships/space_ship.h

@@ -49 +49 @@
     void doCollideNetwork( float energy );
 
-    // !! temporary !!
-    void ADDWEAPON();
-
     bool                  bUp;                //!< up button pressed.
     bool                  bDown;              //!< down button pressed.

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -30 +30 @@
 
 #include "graphics_engine.h"
+#include "dot_emitter.h"
+#include "sprite_particles.h"
 
 using namespace std;
@@ -112 +114 @@
   this->cameraLook = 0.0f;
   this->rotation = 0.0f;
-  this->acceleration = 25.0f;
-  this->airFriction = 3.0f;
+  this->acceleration = 10.0f;
+  this->airFriction = 2.0f;
 
   // camera - issue
@@ -138 +140 @@
   this->rotorNodeRight.setRelCoor(0, 1.0, 2.3);
 
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  // PARTICLES
+  this->burstEmitter[0] = new DotEmitter(200, 5.0, .01);
+  this->burstEmitter[0]->setParent(&this->rotorNodeLeft);
+  this->burstEmitter[0]->setRelCoor(0, -0.7, 0);
+  this->burstEmitter[0]->setRelDir(Quaternion(-M_PI_2, Vector(0,0,1)));
+  this->burstEmitter[0]->setName("TurbineHover_Burst_emitter_Left");
+
+  this->burstEmitter[1] = new DotEmitter(200, 5.0, .01);
+  this->burstEmitter[1]->setParent(&this->rotorNodeRight);
+  this->burstEmitter[1]->setRelCoor(0, -0.7, 0);
+  this->burstEmitter[1]->setRelDir(Quaternion(-M_PI_2, Vector(0,0,1)));
+  this->burstEmitter[1]->setName("TurbineHover_Burst_emitter_Right");
+
+
+  this->burstSystem = new SpriteParticles(1000);
+  this->burstSystem->addEmitter(this->burstEmitter[0]);
+  this->burstSystem->addEmitter(this->burstEmitter[1]);
+  this->burstSystem->setName("SpaceShip_Burst_System");
+  ((SpriteParticles*)this->burstSystem)->setMaterialTexture("maps/radial-trans-noise.png");
+  this->burstSystem->setLifeSpan(1.0, .3);
+  this->burstSystem->setRadius(0.0, 1.5);
+  this->burstSystem->setRadius(0.05, 1.8);
+  this->burstSystem->setRadius(.5, .8);
+  this->burstSystem->setRadius(1.0, 0);
+  this->burstSystem->setColor(0.0, .7,.7,1,.5);
+  this->burstSystem->setColor(0.2, 0,0,0.8,.5);
+  this->burstSystem->setColor(0.5, .5,.5,.8,.3);
+  this->burstSystem->setColor(1.0, .8,.8,.8,.0);
 
 
@@ -153 +182 @@
   registerEvent(EV_MOUSE_MOTION);
 
+  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
 
   // WEAPON_MANAGER configuration
@@ -241 +271 @@
   this->movement(dt);
   this->rotorCycle += this->rotorSpeed * dt;
+
+  // TRYING TO FIX PNode.
+/*  this->cameraNode.setAbsCoorSoft(this->getAbsCoor() + Vector(0,5,0), 30);
+  this->cameraNode.setAbsDirSoft(this->getAbsDir(), 30);*/
 }
 
@@ -293 +327 @@
   this->setRelDirSoft(this->direction * Quaternion(-cameraLook, Vector(0,0,1)), 5);
 
-  this->wingNodeLeft.setRelDirSoft(Quaternion(accel.z * .03 +this->rotation, Vector(1,0,0)), 5);
-  this->rotorNodeLeft.setRelDirSoft(Quaternion(-accel.x * .05+this->rotation + cameraLook, Vector(0,0,1)), 5);
-
-  this->wingNodeRight.setRelDirSoft(Quaternion(accel.z * .03 +this->rotation, Vector(1,0,0)), 5);
-  this->rotorNodeRight.setRelDirSoft(Quaternion(-accel.x*.05 -this->rotation + cameraLook, Vector(0,0,1)), 5);
+  this->wingNodeLeft.setRelDirSoft(Quaternion(accel.z * .05 +this->rotation, Vector(1,0,0)), 5);
+  this->rotorNodeLeft.setRelDirSoft(Quaternion(-accel.x * .07+this->rotation + cameraLook, Vector(0,0,1)), 5);
+
+  this->wingNodeRight.setRelDirSoft(Quaternion(accel.z * .05 +this->rotation, Vector(1,0,0)), 5);
+  this->rotorNodeRight.setRelDirSoft(Quaternion(-accel.x*.07 -this->rotation + cameraLook, Vector(0,0,1)), 5);
 }
 

trunk/src/world_entities/space_ships/turbine_hover.h

@@ -9 +9 @@
 
 #include "playable.h"
+
+// Forward Declaration
+class ParticleEmitter;
+class ParticleSystem;
 
 class TurbineHover : public Playable
@@ -67 +71 @@
     float                 airViscosity;
 
+    ParticleEmitter*      burstEmitter[2];
+    ParticleSystem*       burstSystem;
 };