[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15832] branches/sound-branch: I got a link issue, but I think once I get that fixed the game engine will use the new audio system .
Robert Holcomb
bob_holcomb at hotmail.com
Mon Jul 28 05:16:11 CEST 2008
Revision: 15832
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15832
Author: scourage
Date: 2008-07-28 05:16:10 +0200 (Mon, 28 Jul 2008)
Log Message:
-----------
I got a link issue, but I think once I get that fixed the game engine will use the new audio system. No positional audio....yet.
Modified Paths:
--------------
branches/sound-branch/intern/soundsystem/SND_3d.cpp
branches/sound-branch/intern/soundsystem/SND_C-api.h
branches/sound-branch/projectfiles_vc7/blender/blender.sln
branches/sound-branch/projectfiles_vc7/gameengine/audio/KX_audio.vcproj
branches/sound-branch/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
branches/sound-branch/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/sound-branch/source/gameengine/Audio/SND_GameScene.cpp
branches/sound-branch/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/sound-branch/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/sound-branch/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/sound-branch/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/sound-branch/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/sound-branch/source/gameengine/Ketsji/KX_SoundActuator.cpp
Modified: branches/sound-branch/intern/soundsystem/SND_3d.cpp
===================================================================
--- branches/sound-branch/intern/soundsystem/SND_3d.cpp 2008-07-28 02:05:44 UTC (rev 15831)
+++ branches/sound-branch/intern/soundsystem/SND_3d.cpp 2008-07-28 03:16:10 UTC (rev 15832)
@@ -1,33 +1,36 @@
#include "SND_internal.h"
-void SND_SetListenerGain(float gain)
+void SND_InitListener(void)
{
- gSndCfg.mListenerGain=gain;
-}
-void SND_SetDopplerVelocity(float vel)
-{
- gSndCfg.mListenerDopplerVelocity=vel;
}
-void SND_SetDopplerFactor(float factor)
-{
- gSndCfg.mListenernDopplerFactor=factor;
-}
-
-float SND_GetListenerGain()
-{
- return gSndCfg.mListenerGain;
-}
-
-float SND_GetDopplerVelocity()
-{
- return gSndCfg.mListenerDopplerVelocity;
-}
-
-float SND_GetDopplerFactor()
-{
- return gSndCfg.mListenernDopplerFactor;
-}
-
-
+void SND_SetListenerGain(float gain)
+{
+ gSndCfg.mListenerGain=gain;
+}
+
+void SND_SetDopplerVelocity(float vel)
+{
+ gSndCfg.mListenerDopplerVelocity=vel;
+}
+
+void SND_SetDopplerFactor(float factor)
+{
+ gSndCfg.mListenernDopplerFactor=factor;
+}
+
+float SND_GetListenerGain(void)
+{
+ return gSndCfg.mListenerGain;
+}
+
+float SND_GetDopplerVelocity(void)
+{
+ return gSndCfg.mListenerDopplerVelocity;
+}
+
+float SND_GetDopplerFactor(void)
+{
+ return gSndCfg.mListenernDopplerFactor;
+}
\ No newline at end of file
Modified: branches/sound-branch/intern/soundsystem/SND_C-api.h
===================================================================
--- branches/sound-branch/intern/soundsystem/SND_C-api.h 2008-07-28 02:05:44 UTC (rev 15831)
+++ branches/sound-branch/intern/soundsystem/SND_C-api.h 2008-07-28 03:16:10 UTC (rev 15832)
@@ -101,12 +101,13 @@
extern void SND_SoundStopAll(void);
//positional audio stuff
+extern void SND_InitListener(void);
extern void SND_SetListenerGain(float gain);
extern void SND_SetDopplerVelocity(float vel);
extern void SND_SetDopplerFactor(float factor);
-extern float SND_GetListenerGain();
-extern float SND_GetDopplerVelocity();
-extern float SND_GetDopplerFactor();
+extern float SND_GetListenerGain(void);
+extern float SND_GetDopplerVelocity(void);
+extern float SND_GetDopplerFactor(void);
#ifdef __cplusplus
}
Modified: branches/sound-branch/projectfiles_vc7/blender/blender.sln
===================================================================
--- branches/sound-branch/projectfiles_vc7/blender/blender.sln 2008-07-28 02:05:44 UTC (rev 15831)
+++ branches/sound-branch/projectfiles_vc7/blender/blender.sln 2008-07-28 03:16:10 UTC (rev 15832)
@@ -29,6 +29,7 @@
{E90C7BC2-CF30-4A60-A8F2-0050D592E358} = {E90C7BC2-CF30-4A60-A8F2-0050D592E358}
{9991A3C3-83FE-4AFE-9E18-9D01CB57E879} = {9991A3C3-83FE-4AFE-9E18-9D01CB57E879}
{2AE0D2D9-6A7A-44DE-9EFF-99C9E3257B49} = {2AE0D2D9-6A7A-44DE-9EFF-99C9E3257B49}
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6} = {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}
{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA} = {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}
{32CC75E2-EE85-45E6-8E3D-513F58464F43} = {32CC75E2-EE85-45E6-8E3D-513F58464F43}
{9A307EE5-CD77-47BC-BD87-62508C7E19D8} = {9A307EE5-CD77-47BC-BD87-62508C7E19D8}
@@ -163,10 +164,12 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KX_converter", "..\gameengine\converter\KX_converter.vcproj", "{F90BD995-FFA4-4B18-81E8-FA4322C939E8}"
ProjectSection(ProjectDependencies) = postProject
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6} = {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KX_ketsji", "..\gameengine\ketsji\KX_ketsji.vcproj", "{E645CC32-4823-463E-82F0-46ADDE664018}"
ProjectSection(ProjectDependencies) = postProject
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6} = {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KX_network", "..\gameengine\ketsji\network\KX_network.vcproj", "{6E24BF09-9653-4166-A871-F65CC9E98A9B}"
Modified: branches/sound-branch/projectfiles_vc7/gameengine/audio/KX_audio.vcproj
===================================================================
--- branches/sound-branch/projectfiles_vc7/gameengine/audio/KX_audio.vcproj 2008-07-28 02:05:44 UTC (rev 15831)
+++ branches/sound-branch/projectfiles_vc7/gameengine/audio/KX_audio.vcproj 2008-07-28 03:16:10 UTC (rev 15832)
@@ -23,7 +23,7 @@
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ RuntimeLibrary="1"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
@@ -32,7 +32,8 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLibrarianTool"
- OutputFile="$(OutDir)/KX_audio.lib"/>
+ OutputFile="..\..\..\..\build\msvc_7\libs\debug\KX_audio.lib"
+ AdditionalLibraryDirectories=""/>
<Tool
Name="VCMIDLTool"/>
<Tool
Modified: branches/sound-branch/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
===================================================================
--- branches/sound-branch/projectfiles_vc7/gameengine/converter/KX_converter.vcproj 2008-07-28 02:05:44 UTC (rev 15831)
+++ branches/sound-branch/projectfiles_vc7/gameengine/converter/KX_converter.vcproj 2008-07-28 03:16:10 UTC (rev 15832)
@@ -145,6 +145,7 @@
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\..\build\msvc_7\libs\debug\KX_converter.lib"
+ AdditionalLibraryDirectories=""
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
Modified: branches/sound-branch/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
===================================================================
--- branches/sound-branch/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj 2008-07-28 02:05:44 UTC (rev 15831)
+++ branches/sound-branch/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj 2008-07-28 03:16:10 UTC (rev 15832)
@@ -146,6 +146,7 @@
<Tool
Name="VCLibrarianTool"
OutputFile="..\..\..\..\build\msvc_7\libs\debug\KX_ketsji.lib"
+ AdditionalLibraryDirectories=""
SuppressStartupBanner="TRUE"/>
<Tool
Name="VCMIDLTool"/>
Modified: branches/sound-branch/source/gameengine/Audio/SND_GameScene.cpp
===================================================================
--- branches/sound-branch/source/gameengine/Audio/SND_GameScene.cpp 2008-07-28 02:05:44 UTC (rev 15831)
+++ branches/sound-branch/source/gameengine/Audio/SND_GameScene.cpp 2008-07-28 03:16:10 UTC (rev 15832)
@@ -42,12 +42,21 @@
#include "SND_GameScene.h"
#include "SND_GameDefines.h"
-#include "BAU_soundsystem.h"
#include "SND_C-api.h"
+#include "DNA_sound_types.h"
+
#include <stdlib.h>
#include <iostream>
+
+extern struct bSound* audio_sound_new(const char *name);
+extern struct bSample* audio_sample_find(char *name);
+extern int audio_sound_isplaying(struct bSound *sound);
+extern void audio_sound_play(struct bSound *sound);
+extern void audio_sound_delete(struct bSound *sound);
+
+
SND_Scene::SND_Scene()
{
if(SND_IsInitialized()!=0)
@@ -64,7 +73,6 @@
}
-
SND_Scene::~SND_Scene()
{
StopAllObjects();
@@ -83,15 +91,11 @@
return (int)sound;
}
-
-
void SND_Scene::RemoveAllSamples()
{
//depreciated
}
-
-
bool SND_Scene::CheckBuffer(SND_SoundObject* pObject)
{
//why does this function exist?
@@ -103,8 +107,6 @@
return true;
}
-
-
bool SND_Scene::IsSampleLoaded(STR_String& samplename)
{
bSample* sample=audio_sample_find(samplename.Ptr());
@@ -112,9 +114,6 @@
return sample!=NULL;
}
-
-
-
void SND_Scene::AddObject(SND_SoundObject* pObject)
{
assert(pObject);
@@ -126,7 +125,6 @@
}
-
void SND_Scene::SetListenerTransform(const MT_Vector3& pos,
const MT_Vector3& vel,
const MT_Matrix3x3& ori)
@@ -153,8 +151,6 @@
}
}
-
-
void SND_Scene::AddActiveObject(SND_SoundObject* pObject, MT_Scalar curtime)
{
assert(pObject);
@@ -201,7 +197,7 @@
{
SND_SoundObject* pObject=(SND_SoundObject*)m_activeobjects.getHead();
- // update only the objects that need to be updatedd
+ // update only the objects that need to be updated
for (pObject; !pObject->isTail(); pObject = (SND_SoundObject*)pObject->getNext())
{
if (pObject->Is3D())
@@ -224,7 +220,7 @@
MT_Vector3 local_sound_vel = velocity * lo;
//set the audio properties
- //--consider an FX effect on the sample throught tinySND
+ //--consider an FX effect (or multiple) on the sample throught tinySND
/*m_audiodevice->SetObjectTransform(
id,
local_sound_pos,
@@ -235,8 +231,16 @@
*/
}
- pObject->AddRunning();
+ //play if it needs to be played
+ if (pObject->GetPlaystate() == SND_MUST_PLAY)
+ {
+ audio_sound_play(pObject->m_bSound);
+ pObject->SetPlaystate(SND_PLAYING);
+ pObject->InitRunning();
+ }
+ pObject->AddRunning();
+
// check to see if the sound is still playing
// if not: remove it from playing list
int playstate = audio_sound_isplaying(pObject->m_bSound);
@@ -251,6 +255,8 @@
void SND_Scene::UpdateCD()
{
+ //is this really necissary?
+
/*
if (m_audiodevice)
{
@@ -373,3 +379,8 @@
{
return &m_listener;
}
+
+void SND_Scene::InitListener()
+{
+ SND_InitListener();
+}
\ No newline at end of file
Modified: branches/sound-branch/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- branches/sound-branch/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2008-07-28 02:05:44 UTC (rev 15831)
+++ branches/sound-branch/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2008-07-28 03:16:10 UTC (rev 15832)
@@ -185,10 +185,11 @@
NG_LoopBackNetworkDeviceInterface();
// get an audiodevice
- //FIXME -Bob
+ //the audio device is the one that blender uses globally
// SND_DeviceManager::Subscribe();
// SND_IAudioDevice* audiodevice = SND_DeviceManager::Instance();
// audiodevice->UseCD();
+
// create a ketsji/blendersystem (only needed for timing and stuff)
KX_BlenderSystem* kxsystem = new KX_BlenderSystem();
Modified: branches/sound-branch/source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
--- branches/sound-branch/source/gameengine/Converter/KX_ConvertActuators.cpp 2008-07-28 02:05:44 UTC (rev 15831)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list