Changeset 9234 in orxonox.OLD

Timestamp:

Jul 5, 2006, 2:31:04 PM (18 years ago)

Author:

amaechler

Message:

 

Location:

branches/presentation/src

Files:

• lib/graphics/effects/fog_effect.cc (modified) (1 diff)
• lib/graphics/effects/snow_effect.cc (modified) (1 diff)
• world_entities/space_ships/hover.cc (modified) (5 diffs)
• world_entities/space_ships/hover.h (modified) (2 diffs)

branches/presentation/src/lib/graphics/effects/fog_effect.cc

@@ -23 +23 @@
 
 // Define shell commands
-SHELL_COMMAND(activate, FogEffect, activateFog);
-SHELL_COMMAND(deactivate, FogEffect, deactivateFog);
+//SHELL_COMMAND(activate, FogEffect, activateFog);
+//SHELL_COMMAND(deactivate, FogEffect, deactivateFog);
 SHELL_COMMAND(fadein, FogEffect, fadeInFog);
 SHELL_COMMAND(fadeout, FogEffect, fadeOutFog);

branches/presentation/src/lib/graphics/effects/snow_effect.cc

@@ -57 +57 @@
                 if (this->windBuffer != NULL)
                         ResourceManager::getInstance()->unload(this->windBuffer);
-                        this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.wav", WAV);
+          this->windBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/wind.wav", WAV);
         }
 

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

@@ -25 +25 @@
 
 #include "util/loading/factory.h"
-#include "util/loading/resource_manager.h"
+//#include "util/loading/resource_manager.h"
 
 #include "key_mapper.h"
@@ -52 +52 @@
 {
   this->setPlayer(NULL);
+
+  //if (this->hoverBuffer != NULL)
+  //  ResourceManager::getInstance()->unload(this->hoverBuffer);
 }
 
@@ -71 +74 @@
   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);
+  //load sound
+  //if (this->hoverBuffer != NULL)
+  //  ResourceManager::getInstance()->unload(this->hoverBuffer);
+  //this->hoverBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/engine/hover.wav", WAV);
 
 }
@@ -116 +119 @@
 {
 
-  this->hitEntity = NULL;
-  this->hoverBuffer = NULL;
+  //this->hitEntity = NULL;
+  //this->hoverBuffer = NULL;
 
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
@@ -229 +232 @@
   State::getCameraTargetNode()->setParentSoft(&this->cameraNode);
 
-  this->soundSource.play(this->hoverBuffer, 0.3f, true);
+  //this->soundSource.play(this->hoverBuffer, 0.3f, true);
 
 }

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

@@ -8 +8 @@
 #define _HOVER_H
 
-#include "sound_buffer.h"
-#include "sound_source.h"
+//#include "sound_buffer.h"
+//#include "sound_source.h"
 
 #include "playable.h"
@@ -73 +73 @@
     WorldEntity*          hitEntity;
 
-    OrxSound::SoundSource  soundSource;
-    OrxSound::SoundBuffer* hoverBuffer;
+    //OrxSound::SoundSource  soundSource;
+    //OrxSound::SoundBuffer* hoverBuffer;
 };