Index: trunk/src/fmod/fmod_audio.cc
===================================================================
--- trunk/src/fmod/fmod_audio.cc	(revision 329)
+++ trunk/src/fmod/fmod_audio.cc	(revision 330)
@@ -27,5 +27,5 @@
 		return;
 	}
-	result = FMOD_System_Init( system, 64, FMOD_INIT_NORMAL, 0 );
+	result = FMOD_System_Init( system, 64, FMOD_3D | FMOD_INIT_3D_RIGHTHANDED, 0 );
 	if ( result != FMOD_OK )
 	{
@@ -36,16 +36,22 @@
 }
 
-
-nv::channel fmod::audio::play_sound( nv::sound a_sound )
+nv::channel nv::fmod::audio::play_sound( sound a_sound, float volume, float pan /*= 0.0f */ )
 {
 	sound_info* info = m_sounds.get( a_sound );
 	if ( info )
 	{
-		FMOD_SYSTEM* system = (FMOD_SYSTEM*)m_system;
-		FMOD_SOUND* sample  = (FMOD_SOUND*)( info->fmod_sound );
-		FMOD_RESULT result  = FMOD_System_PlaySound( system, FMOD_CHANNEL_FREE, sample, false, 0 );
+		FMOD_SYSTEM* system   = (FMOD_SYSTEM*)m_system;
+		FMOD_SOUND* sample    = (FMOD_SOUND*)( info->fmod_sound );
+		FMOD_CHANNEL* channel = nullptr;
+		FMOD_RESULT result    = FMOD_System_PlaySound( system, FMOD_CHANNEL_FREE, sample, true, &channel );
 		if ( result != FMOD_OK )
 		{
 			NV_LOG( LOG_WARNING, "FMOD failed to play sound -- " << FMOD_ErrorString( result ) );
+		}
+		else
+		{
+			FMOD_Channel_SetVolume( channel, volume );
+			FMOD_Channel_SetPan( channel, pan );
+			FMOD_Channel_SetPaused( channel, false );
 		}
 	}
@@ -53,9 +59,38 @@
 }
 
+nv::channel nv::fmod::audio::play_sound( sound a_sound, vec3 position )
+{
+	sound_info* info = m_sounds.get( a_sound );
+	if ( info )
+	{
+		FMOD_SYSTEM* system   = (FMOD_SYSTEM*)m_system;
+		FMOD_SOUND* sample    = (FMOD_SOUND*)( info->fmod_sound );
+		FMOD_CHANNEL* channel = nullptr;
+		FMOD_RESULT result    = FMOD_System_PlaySound( system, FMOD_CHANNEL_FREE, sample, true, &channel );
+		if ( result != FMOD_OK )
+		{
+			NV_LOG( LOG_WARNING, "FMOD failed to play sound -- " << FMOD_ErrorString( result ) );
+		}
+		else
+		{
+			FMOD_VECTOR fmod_position;
+			fmod_position.x = position.x;
+			fmod_position.y = position.y;
+			fmod_position.z = position.z;
+			FMOD_Channel_Set3DMinMaxDistance( channel, 1, 100000 );
+			FMOD_Channel_Set3DAttributes( channel, &fmod_position, 0 );
+			FMOD_Channel_SetPaused( channel, false );
+		}
+	}
+	return channel();
+}
+
+
+
 nv::sound fmod::audio::load_sound( const std::string& a_path )
 {
 	FMOD_SYSTEM* system = (FMOD_SYSTEM*)m_system;
 	FMOD_SOUND* sample;
-	FMOD_RESULT fm_result = FMOD_System_CreateSound( system, a_path.c_str(), FMOD_DEFAULT, 0, &sample );
+	FMOD_RESULT fm_result = FMOD_System_CreateSound( system, a_path.c_str(), FMOD_3D, 0, &sample );
 	if ( fm_result != FMOD_OK )
 	{
@@ -79,8 +114,32 @@
 }
 
-void fmod::audio::update()
+void nv::fmod::audio::set_orientation( vec3 forward, vec3 up )
 {
+ 	FMOD_VECTOR fmod_forward;
+	fmod_forward.x = forward.x;
+	fmod_forward.y = forward.y;
+	fmod_forward.z = forward.z;
+	FMOD_VECTOR fmod_up;
+	fmod_up.x = up.x;
+	fmod_up.y = up.y;
+	fmod_up.z = up.z;
+	// TODO: we also need to setup orientation!
+	FMOD_System_Set3DListenerAttributes( (FMOD_SYSTEM*)m_system, 0, 0, 0, &fmod_forward, &fmod_up );
+}
+
+void fmod::audio::update( vec3 position )
+{
+	m_position = position;
+	FMOD_VECTOR fmod_position;
+	fmod_position.x = position.x;
+	fmod_position.y = position.y;
+	fmod_position.z = position.z;
+// 	FMOD_VECTOR fmod_up;
+// 	fmod_up.x = 0.0f;
+// 	fmod_up.y = 0.0f;
+// 	fmod_up.z = 0.0f;
+	// TODO: we also need to setup orientation!
+	FMOD_System_Set3DListenerAttributes( (FMOD_SYSTEM*)m_system, 0, &fmod_position, 0, 0, 0 );
 	FMOD_System_Update( (FMOD_SYSTEM*)m_system );
-	// no-op
 }