X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fambient_sound.cpp;h=8837f91d1da583472ca16786c5dcd851cfde2527;hb=75acd4b141f45e851a492f089aa9ad24a9552409;hp=5ac3b0fbe508d5c6ff4c26f1cd91db21d88e35f9;hpb=88fac7ee1f38465b6b3d2a9946962db1b1c41a94;p=supertux.git

diff --git a/src/object/ambient_sound.cpp b/src/object/ambient_sound.cpp
index 5ac3b0fbe..8837f91d1 100644
--- a/src/object/ambient_sound.cpp
+++ b/src/object/ambient_sound.cpp
@@ -22,6 +22,7 @@
 #include <math.h>
 #include <stdexcept>
 #include <iostream>
+#include <limits>
 
 #include "ambient_sound.hpp"
 #include "object_factory.hpp"
@@ -30,8 +31,8 @@
 #include "audio/sound_manager.hpp"
 #include "audio/sound_source.hpp"
 #include "log.hpp"
-#include "scripting/ambient_sound.hpp"
 #include "scripting/squirrel_util.hpp"
+#include "object/camera.hpp"
 
 AmbientSound::AmbientSound(const lisp::Lisp& lisp)
 {
@@ -62,12 +63,12 @@ AmbientSound::AmbientSound(const lisp::Lisp& lisp)
   lisp.get("volume"         ,maximumvolume  );
 
   // set dimension to zero if smaller than 64, which is default size in flexlay
-  
+
   if ((dimension.x <= 64) || (dimension.y <= 64)) {
     dimension.x = 0;
     dimension.y = 0;
   }
-  
+
   // square all distances (saves us a sqrt later)
 
   distance_bias*=distance_bias;
@@ -76,13 +77,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;
 }
 
@@ -98,15 +100,16 @@ AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std:
   distance_bias=bias*bias;
   maximumvolume=vol;
   sample=file;
-  
+
   // 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;
 }
 
@@ -132,10 +135,10 @@ AmbientSound::start_playing()
     sound_source = sound_manager->create_sound_source(sample);
     if(!sound_source)
       throw std::runtime_error("file not found");
-   
+
     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;
@@ -146,15 +149,16 @@ AmbientSound::start_playing()
 }
 
 void
-AmbientSound::update(float deltat) 
-{ 
+AmbientSound::update(float deltat)
+{
   if (latency-- <= 0) {
     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:
@@ -169,14 +173,14 @@ AmbientSound::update(float deltat)
     // inside the bias: full volume (distance 0)
     if (sqrdistance<0)
       sqrdistance=0;
-    
+
     // calculate target volume - will never become 0
     targetvolume=1/(1+sqrdistance*distance_factor);
     float rise=targetvolume/currentvolume;
 
     // 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) {
 
@@ -184,18 +188,18 @@ 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));
     }
-  } 
+  }
 
   // heuristically measured "good" latency maximum
 
@@ -204,23 +208,40 @@ AmbientSound::update(float deltat)
 }
 
 void
-AmbientSound::draw(DrawingContext &) 
+AmbientSound::draw(DrawingContext &)
 {
 }
 
 void
 AmbientSound::expose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  if (name == "") return;
-  Scripting::AmbientSound* interface = new Scripting::AmbientSound(this);
-  expose_object(vm, table_idx, interface, name, true);
+  Scripting::AmbientSound* interface = static_cast<Scripting::AmbientSound*> (this);
+  expose_object(vm, table_idx, interface, name, false);
 }
 
 void
 AmbientSound::unexpose(HSQUIRRELVM vm, SQInteger table_idx)
 {
-  if (name == "") return;
   Scripting::unexpose_object(vm, table_idx, name);
 }
 
+void
+AmbientSound::set_pos(float x, float y)
+{
+  position.x = x;
+  position.y = y;
+}
+
+float
+AmbientSound::get_pos_x() const
+{
+  return position.x;
+}
+
+float
+AmbientSound::get_pos_y() const
+{
+  return position.y;
+}
+
 IMPLEMENT_FACTORY(AmbientSound, "ambient_sound");