Changeset 10712 in orxonox.OLD

Timestamp:

Jun 18, 2007, 9:27:34 AM (17 years ago)

Author:

rennerc

Message:

AdmWeapon sound, ActionboxEnemy weapons

Location:

branches/presentation/src/world_entities

Files:

• npcs/actionbox_enemy.cc (modified) (6 diffs)
• npcs/actionbox_enemy.h (modified) (2 diffs)
• weapons/bsp_weapon.cc (modified) (4 diffs)
• weapons/bsp_weapon.h (modified) (1 diff)

branches/presentation/src/world_entities/npcs/actionbox_enemy.cc

@@ -24 +24 @@
 #include "playable.h"
 
+#include "particles/dot_emitter.h"
+#include "particles/emitter_node.h"
+#include "particles/sprite_particles.h"
+
 #include "actionbox_enemy.h"
 
@@ -30 +34 @@
 
 ActionboxEnemy::ActionboxEnemy(const TiXmlElement* root)
+  :weaponMan(this)
 {
   PRINTF(0)("ActionboxEnemy\n");
@@ -49 +54 @@
   if ( root )
     this->loadParams( root );
+  
+  
+    this->weaponMan.setParentEntity( this);
+  //weapons:
+
+  this->weaponMan.setParentEntity( this);
+
+  this->weaponMan.setSlotCount(8);
+
+  this->weaponMan.createWeaponSlot(0, 3.270, 1.028, .155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(1, 3.270, 1.028, -.155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(2, 4.385, .063, .876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(3, 4.385, -.063, -.876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(4, 1.635, -.612, 2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(5, 1.536, -.612, -2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(6, 1.536, -.612, 3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->weaponMan.createWeaponSlot(7, 1.536, -.612, -3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+
+  this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
+  this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
+  this->weaponMan.addWeaponToSlot(0, 2, "RFCannon");
+  this->weaponMan.addWeaponToSlot(0, 3, "RFCannon");
+  this->weaponMan.addWeaponToSlot(1, 0, "RFCannon");
+  this->weaponMan.addWeaponToSlot(1, 1, "RFCannon");
+  this->weaponMan.addWeaponToSlot(1, 2, "RFCannon");
+  this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");
+
+  this->weaponMan.addWeaponToSlot(0, 4, "NadionLaser");
+  this->weaponMan.addWeaponToSlot(0, 5, "NadionLaser");
+  this->weaponMan.addWeaponToSlot(2, 4, "NadionLaser");
+  this->weaponMan.addWeaponToSlot(2, 5, "NadionLaser");
+
+  this->weaponMan.addWeaponToSlot(0, 6, "Disruptor");
+  this->weaponMan.addWeaponToSlot(0, 7, "Disruptor");
+  this->weaponMan.addWeaponToSlot(3, 6, "Disruptor");
+  this->weaponMan.addWeaponToSlot(3, 7, "Disruptor");
+  
+  this->weaponMan.changeWeaponConfig(0);
+  
+  this->weaponMan.getFixedTarget()->setParent(this);
+  this->weaponMan.getFixedTarget()->setRelCoor(100000,0,0);
+  this->weaponMan.hideCrosshair();
 }
 
@@ -62 +110 @@
 void ActionboxEnemy::tick( float dt )
 {
+  weaponMan.tick( dt );
   this->bFire = false;
   
@@ -123 +172 @@
     {
       this->bFire = true;
-      PRINTF(0)("FIRE\n");
+      weaponMan.fire();
     }
   }
@@ -263 +312 @@
   WorldEntity::draw();
 }
+
+void ActionboxEnemy::destroy( WorldEntity * killer )
+{
+  EmitterNode* node  = NULL;
+  DotEmitter* emitter = NULL;
+  SpriteParticles*  explosionParticles  = NULL;
+
+  explosionParticles = new SpriteParticles(200);
+  explosionParticles->setName("SpaceShipExplosionParticles");
+  explosionParticles->setLifeSpan(.2, .3);
+  explosionParticles->setRadius(0.0, 10.0);
+  explosionParticles->setRadius(.5, 6.0);
+  explosionParticles->setRadius(1.0, 3.0);
+  explosionParticles->setColor(0.0, 1,1,1,.9);
+  explosionParticles->setColor(0.1,  1,1,0,.9);
+  explosionParticles->setColor(0.5, .8,.4,0,.5);
+  explosionParticles->setColor(1.0, .2,.2,.2,.5);
+
+
+  emitter = new DotEmitter( 2000, 70, 360);
+  emitter->setEmissionRate( 200.0);
+
+  node  = new EmitterNode( .1f);
+  node->setupParticle( emitter, explosionParticles);
+  node->setAbsDir( this->getAbsDir());
+  node->setVelocity( this->getVelocity() * .9f);
+  node->setAbsCoor( this->getAbsCoor());
+  if( !node->start())
+    PRINTF(0)("Explosion node not correctly started!");
+  
+  this->setAbsCoor( this->getAbsCoor() + Vector(100,0,0) + Vector(1,0,0) * VECTOR_RAND(150).dot(Vector(1,0,0)));
+}

branches/presentation/src/world_entities/npcs/actionbox_enemy.h

@@ -19 +19 @@
 
     virtual void loadParams(const TiXmlElement* root);
+    
+    virtual void destroy( WorldEntity* killer );
    
   private:
@@ -41 +43 @@
     void moveTowardsBox( ActionBox* box, float dt );
     void moveTowards( Vector targetPos, Vector targetDir, float dt );
+    
+    WeaponManager         weaponMan;      //!< the weapon manager: managing a list of energy weapons to wepaon-slot mapping
 };
 

branches/presentation/src/world_entities/weapons/bsp_weapon.cc

@@ -22 +22 @@
 #include "environments/bsp_entity.h"
 #include "loading/fast_factory.h"
+#include "sound_engine.h"
 
 ObjectListDefinition(BspWeapon);
@@ -41 +42 @@
 BspWeapon::~BspWeapon ()
 {
-          // will be deleted
+  if ( soundSource_shoot.isPlaying() )
+    soundSource_shoot.stop();
 }
 
@@ -125 +127 @@
         this->aimingSystem->setParent( this );
         this->aimingSystem->toList(list);
+        
+        this->soundSource_shoot.setSourceNode(this);
+        this->soundBuffer_shoot = OrxSound::ResourceSoundBuffer("sounds/explosions/doulette.wav");
         
 }
@@ -130 +135 @@
 void BspWeapon::shoot()
 {
-        //gunFirExpl.explode(gunFire1,Vector(2,2,2));
-        //gunFirExpl.explode(gunFire2,Vector(2,2,2));
-
+
+  soundSource_shoot.play( soundBuffer_shoot, OrxSound::SoundEngine::getInstance()->getEffectsVolume(), 0.5);
+  
 for ( std::list<MuzzleFlash*>::iterator it = gunFire.begin(); it!=gunFire.end(); it++)
 {

branches/presentation/src/world_entities/weapons/bsp_weapon.h

@@ -73 +73 @@
                 bool alwaysHits;
                 void addPoint(float x, float y, float z);
+                
+                OrxSound::SoundSource       soundSource_shoot;
+                OrxSound::SoundBuffer       soundBuffer_shoot;;
                 
     std::list<MuzzleFlash*> gunFire;