From a91b59ebc099a852452a9dff015174668e04271b Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Tue, 19 Jan 2010 17:54:55 -0800
Subject: [PATCH] allow audio-sources to control reference distance and rolloff
 factor

---
 extra/audio/engine/engine.factor         | 10 +++++++++-
 extra/gpu/demos/raytrace/raytrace.factor |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/extra/audio/engine/engine.factor b/extra/audio/engine/engine.factor
index 5345b750d6..176fc3c305 100644
--- a/extra/audio/engine/engine.factor
+++ b/extra/audio/engine/engine.factor
@@ -10,7 +10,9 @@ TUPLE: audio-source
     { position initial: { 0.0 0.0 0.0 } }
     { gain float initial: 1.0 }
     { velocity initial: { 0.0 0.0 0.0 } }
-    { relative? boolean initial: f } ;
+    { relative? boolean initial: f }
+    { distance float initial: 1.0 }
+    { rolloff float initial: 1.0 } ;
 
 TUPLE: audio-orientation
     { forward initial: { 0.0 0.0 -1.0 } }
@@ -32,12 +34,16 @@ GENERIC: audio-position ( source/listener -- position )
 GENERIC: audio-gain ( source/listener -- gain )
 GENERIC: audio-velocity ( source/listener -- velocity )
 GENERIC: audio-relative? ( source -- relative? )
+GENERIC: audio-distance ( source -- distance )
+GENERIC: audio-rolloff ( source -- rolloff )
 GENERIC: audio-orientation ( listener -- orientation )
 
 M: object audio-position drop { 0.0 0.0 0.0 } ; inline
 M: object audio-gain drop 1.0 ; inline
 M: object audio-velocity drop { 0.0 0.0 0.0 } ; inline
 M: object audio-relative? drop f ; inline
+M: object audio-distance drop 1.0 ; inline
+M: object audio-rolloff drop 1.0 ; inline
 M: object audio-orientation drop T{ audio-orientation } ; inline
 
 M: audio-source audio-position position>> ; inline
@@ -188,6 +194,8 @@ ERROR: audio-context-not-available device-name ;
         [ AL_GAIN swap audio-gain alSourcef ]
         [ AL_VELOCITY swap audio-velocity first3 alSource3f ]
         [ AL_SOURCE_RELATIVE swap audio-relative? c:>c-bool alSourcei ]
+        [ AL_REFERENCE_DISTANCE swap audio-distance alSourcef ]
+        [ AL_ROLLOFF_FACTOR swap audio-rolloff alSourcef ]
     } 2cleave ;
 
 :: update-audio-clip ( audio-clip -- )
diff --git a/extra/gpu/demos/raytrace/raytrace.factor b/extra/gpu/demos/raytrace/raytrace.factor
index 53e8c63ddf..54912544f1 100644
--- a/extra/gpu/demos/raytrace/raytrace.factor
+++ b/extra/gpu/demos/raytrace/raytrace.factor
@@ -1,7 +1,7 @@
 ! (c)2009 Joe Groff bsd license
 USING: accessors arrays combinators.tuple game.loop game.worlds
 generalizations gpu gpu.render gpu.shaders gpu.util gpu.util.wasd
-kernel literals math math.matrices math.order math.vectors
+kernel literals math math.libm math.matrices math.order math.vectors
 method-chains sequences ui ui.gadgets ui.gadgets.worlds
 ui.pixel-formats audio.engine audio.loader locals ;
 IN: gpu.demos.raytrace
@@ -50,6 +50,7 @@ TUPLE: raytrace-world < wasd-world
     [ home>> ] bi m.v ;
 
 M: sphere audio-position sphere-center ; inline
+M: sphere audio-distance radius>> fsqrt 2.0 * ; inline
 
 : <sphere-uniforms> ( world -- uniforms )
     [ wasd-mv-inv-matrix ]