Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / object / ambient_sound.cpp

diff --git a/src/object/ambient_sound.cpp b/src/object/ambient_sound.cpp
index b423186..05748fa 100644 (file)
--- a/src/object/ambient_sound.cpp
+++ b/src/object/ambient_sound.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,25 +12,21 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <config.h>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+#include <limits>
 #include <math.h>
-#include <stdexcept>
-#include <iostream>
 
-#include "ambient_sound.hpp"
-#include "object_factory.hpp"
-#include "lisp/lisp.hpp"
-#include "sector.hpp"
 #include "audio/sound_manager.hpp"
 #include "audio/sound_source.hpp"
-#include "log.hpp"
+#include "object/ambient_sound.hpp"
+#include "object/camera.hpp"
 #include "scripting/squirrel_util.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
+#include "util/reader.hpp"
 
-AmbientSound::AmbientSound(const lisp::Lisp& lisp)
+AmbientSound::AmbientSound(const Reader& lisp)
 {
   name="";
   position.x = 0;
@@ -75,13 +69,14 @@ AmbientSound::AmbientSound(const lisp::Lisp& lisp)
   // set default silence_distance
 
   if (distance_factor == 0)
-    silence_distance = 10e99;
+    silence_distance = std::numeric_limits<float>::max();
   else
     silence_distance = 1/distance_factor;
 
   lisp.get("silence_distance",silence_distance);
 
   sound_source = 0; // not playing at the beginning
+  sound_manager->preload(sample);
   latency=0;
 }
 
@@ -101,11 +96,12 @@ AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std:
   // set default silence_distance
 
   if (distance_factor == 0)
-    silence_distance = 10e99;
+    silence_distance = std::numeric_limits<float>::max();
   else
     silence_distance = 1/distance_factor;
 
   sound_source = 0; // not playing at the beginning
+  sound_manager->preload(sample);
   latency=0;
 }
 
@@ -134,7 +130,7 @@ AmbientSound::start_playing()
 
     sound_source->set_gain(0);
     sound_source->set_looping(true);
-    currentvolume=targetvolume=1e-20;
+    currentvolume=targetvolume=1e-20f;
     sound_source->play();
   } catch(std::exception& e) {
     log_warning << "Couldn't play '" << sample << "': " << e.what() << "" << std::endl;
@@ -151,9 +147,10 @@ AmbientSound::update(float deltat)
     float px,py;
     float rx,ry;
 
-    // Player position
-    px=Sector::current()->player->get_pos().x;
-    py=Sector::current()->player->get_pos().y;
+    if (!Sector::current() || !Sector::current()->camera) return;
+    // Camera position
+    px=Sector::current()->camera->get_center().x;
+    py=Sector::current()->camera->get_center().y;
 
     // Relate to which point in the area
     rx=px<position.x?position.x:
@@ -175,7 +172,7 @@ AmbientSound::update(float deltat)
 
     // rise/fall half life?
     currentvolume*=pow(rise,deltat*10);
-    currentvolume += 1e-6; // volume is at least 1e-6 (0 would never rise)
+    currentvolume += 1e-6f; // volume is at least 1e-6 (0 would never rise)
 
     if (sound_source != 0) {
 
@@ -183,15 +180,15 @@ AmbientSound::update(float deltat)
       sound_source->set_gain(currentvolume*maximumvolume);
 
       if (sqrdistance>=silence_distance && currentvolume<1e-3)
-       stop_playing();
+        stop_playing();
       latency=0;
     } else {
       if (sqrdistance<silence_distance) {
-       start_playing();
-       latency=0;
+        start_playing();
+        latency=0;
       }
       else // set a reasonable latency
-       latency=(int)(0.001/distance_factor);
+        latency=(int)(0.001/distance_factor);
       //(int)(10*((sqrdistance-silence_distance)/silence_distance));
     }
   }
@@ -221,19 +218,24 @@ AmbientSound::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 }
 
 void
-AmbientSound::set_pos(float x, float y){
+AmbientSound::set_pos(float x, float y)
+{
   position.x = x;
   position.y = y;
 }
 
 float
-AmbientSound::get_pos_x(){;
+AmbientSound::get_pos_x() const
+{
   return position.x;
 }
 
 float
-AmbientSound::get_pos_y(){
+AmbientSound::get_pos_y() const
+{
   return position.y;
 }
 
 IMPLEMENT_FACTORY(AmbientSound, "ambient_sound");
+
+/* EOF */