Changeset 9230 in orxonox.OLD

Timestamp:

Jul 5, 2006, 2:06:28 PM (18 years ago)

Author:

amaechler

Message:

 

Location:

branches/presentation/src/world_entities/space_ships

Files:

• helicopter.cc (modified) (2 diffs)
• helicopter.h (modified) (2 diffs)
• hover.cc (modified) (5 diffs)
• hover.h (modified) (2 diffs)

branches/presentation/src/world_entities/space_ships/helicopter.cc

@@ -43 +43 @@
                             ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
                             ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
-                            
+
                        );
 
@@ -124 +124 @@
 void Helicopter::init()
 {
+  this->chopperBuffer = NULL;
+
   this->setClassID(CL_HELICOPTER, "Helicopter");
-
   PRINTF(4)("HELICOPTER INIT\n");
 

branches/presentation/src/world_entities/space_ships/helicopter.h

@@ -39 +39 @@
 
     virtual void process(const Event &event);
-    
+
     virtual void moveUp(bool move){bAscend = move;};
     virtual void moveDown(bool move){bDescend = move;};
@@ -78 +78 @@
     float                 airViscosity;
 
-    OrxSound::SoundSource soundSource;
-    OrxSound::SoundBuffer*chopperBuffer;
+    OrxSound::SoundSource  soundSource;
+    OrxSound::SoundBuffer* chopperBuffer;
 
 };

branches/presentation/src/world_entities/space_ships/hover.cc

@@ -25 +25 @@
 
 #include "util/loading/factory.h"
+#include "util/loading/resource_manager.h"
+
 #include "key_mapper.h"
 #include "state.h"
@@ -43 +45 @@
                         ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
                        );
-                       
+
 /**
  *  destructs the hover, deletes alocated memory
@@ -68 +70 @@
 
   this->loadParams(doc.RootElement());
+
+ //load sound
+  if (this->hoverBuffer != NULL)
+    ResourceManager::getInstance()->unload(this->hoverBuffer);
+  this->hoverBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/engine/hover.wav", WAV);
+
 }
 
@@ -107 +115 @@
 void Hover::init()
 {
+
+  this->hitEntity = NULL;
+  this->hoverBuffer = NULL;
+
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
   this->setClassID(CL_HOVER, "Hover");
@@ -216 +228 @@
   State::getCameraNode()->setRelCoorSoft(-10, 0,0);
   State::getCameraTargetNode()->setParentSoft(&this->cameraNode);
+
+  this->soundSource.play(this->hoverBuffer, 0.3f, true);
+
 }
 

branches/presentation/src/world_entities/space_ships/hover.h

@@ -7 +7 @@
 #ifndef _HOVER_H
 #define _HOVER_H
+
+#include "sound_buffer.h"
+#include "sound_source.h"
 
 #include "playable.h"
@@ -68 +71 @@
     float                 airViscosity;
 
-    WorldEntity* hitEntity;
+    WorldEntity*          hitEntity;
+
+    OrxSound::SoundSource  soundSource;
+    OrxSound::SoundBuffer* hoverBuffer;
 };