Changeset 10695 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jun 14, 2007, 4:46:18 PM (17 years ago)

Author:

snellen

Message:

changes on soundengine and mover by fabian landau

Location:

trunk/src/world_entities

Files:

• WorldEntities.am (modified) (4 diffs)
• effects/explosion.cc (modified) (6 diffs)
• effects/explosion.h (modified) (3 diffs)
• npcs/mover.cc (deleted)
• npcs/mover.h (deleted)

trunk/src/world_entities/WorldEntities.am

@@ -12 +12 @@
                 world_entities/npcs/repair_station.cc \
                 world_entities/npcs/attractor_mine.cc \
-                world_entities/npcs/mover.cc \
                 \
                 \
@@ -79 +78 @@
                 world_entities/environments/planet.cc \
                 world_entities/environments/bsp_entity.cc \
+                world_entities/environments/mover.cc \
+                world_entities/environments/mover_station.cc \
+                world_entities/environments/mover_station_list.cc \
+                world_entities/environments/mover_trigger.cc \
+                world_entities/environments/mover_trigger_approach.cc \
+                world_entities/environments/mover_trigger_delay_list.cc \
+                world_entities/environments/mover_trigger_event.cc \
+                world_entities/environments/mover_trigger_event_list.cc \
+                world_entities/environments/mover_trigger_intervisibility.cc \
+                world_entities/environments/mover_trigger_key.cc \
+                world_entities/environments/mover_trigger_list.cc \
+                world_entities/environments/mover_trigger_pointer_list.cc \
+                world_entities/environments/mover_trigger_mapstart.cc \
                 \
                 \
@@ -146 +158 @@
                 npcs/repair_station.h \
                 npcs/attractor_mine.h \
-                npcs/mover.h \
                 \
                 environments/environment.h \
@@ -224 +235 @@
                 environments/mapped_water.h \
                 environments/rotor.h \
+                environments/mover.h \
+                environments/mover_station.h \
+                environments/mover_station_list.h \
+                environments/mover_trigger.h \
+                environments/mover_trigger_approach.h \
+                environments/mover_trigger_delay_list.h \
+                environments/mover_trigger_event.h \
+                environments/mover_trigger_event_list.h \
+                environments/mover_trigger_intervisibility.h \
+                environments/mover_trigger_key.h \
+                environments/mover_trigger_list.h \
+                environments/mover_trigger_pointer_list.h \
+                environments/mover_trigger_mapstart.h \
                 \
                 elements/image_entity.h \

trunk/src/world_entities/effects/explosion.cc

@@ -25 +25 @@
 #include "particles/sprite_particles.h"
 
+#include "sound/resource_sound_buffer.h"
+#include "sound_engine.h"
+
+
 ObjectListDefinition(Explosion);
 CREATE_FAST_FACTORY_STATIC(Explosion);
@@ -38 +42 @@
                         //Explode !
                             ->addMethod("explode", Executor3<Explosion, lua_State*, float, float, float>(&Explosion::explode))
+                            ->addMethod("setExplosionSound", Executor1<Explosion, lua_State*, const std::string&>(&Explosion::setExplosionSound))
                        );
 
@@ -55 +60 @@
   this->lifeCycle = 0.0f;
   this->lifeTime = .5f;
-
+  
+  this->explosionSound.setSourceNode(this);
+  
 }
 
@@ -65 +72 @@
 {
   delete this->emitter;
-
+  if (this->explosionSound.isPlaying())
+    this->explosionSound.stop();
   /* this is normaly done by World.cc by deleting the ParticleEngine */
   if (Explosion::explosionParticles != NULL && Explosion::objectList().size() <= 1)
@@ -88 +96 @@
   explosion->emitter->setSize(Vector(x,y,z));
   explosion->activate();
+  
+  
 }
 
@@ -113 +123 @@
   this->toList(OM_DEAD_TICK);
   this->lifeCycle = 0.0;
+  
+  this->explosionSound.play(this->explosionSoundBuffer, OrxSound::SoundEngine::getInstance()->getEffectsVolume(), 0.01, true);
 }
 

trunk/src/world_entities/effects/explosion.h

@@ -8 +8 @@
 
 #include "world_entity.h"
+#include "sound_source.h"
+#include "sound_buffer.h"
+#include "sound/resource_sound_buffer.h"
 
 class SpriteParticles;
@@ -19 +22 @@
     static void explode (PNode* position, const Vector& size);
     void explode (float x, float y, float z); /// Explode at the current position with size (x,y,z)
+    void setExplosionSound(const std::string& newExplosionSound){  this->explosionSoundBuffer = OrxSound::ResourceSoundBuffer(newExplosionSound);  }
     
     Explosion ();
@@ -36 +40 @@
     static SpriteParticles*    explosionParticles;
     BoxEmitter*                emitter;
+    
+    OrxSound::SoundSource      explosionSound;
+    OrxSound::SoundBuffer      explosionSoundBuffer;
 };