[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15828] branches/sound-branch: Working on the game engine.
Robert Holcomb
bob_holcomb at hotmail.com
Mon Jul 28 02:45:16 CEST 2008
Revision: 15828
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15828
Author: scourage
Date: 2008-07-28 02:45:16 +0200 (Mon, 28 Jul 2008)
Log Message:
-----------
Working on the game engine.
Modified Paths:
--------------
branches/sound-branch/intern/soundsystem/SND_C-api.h
branches/sound-branch/intern/soundsystem/SND_internal.h
branches/sound-branch/intern/soundsystem/make/msvc_7_0/soundsystem.vcproj
branches/sound-branch/projectfiles_vc7/blender/blender.sln
branches/sound-branch/projectfiles_vc7/gameengine/audio/KX_audio.vcproj
branches/sound-branch/source/blender/include/BAU_soundsystem.h
branches/sound-branch/source/blender/src/soundsystem.c
branches/sound-branch/source/gameengine/Audio/SND_GameCDObject.cpp
branches/sound-branch/source/gameengine/Audio/SND_GameScene.cpp
branches/sound-branch/source/gameengine/Audio/SND_GameScene.h
branches/sound-branch/source/gameengine/Audio/SND_GameSoundObject.cpp
branches/sound-branch/source/gameengine/Audio/SND_GameSoundObject.h
Added Paths:
-----------
branches/sound-branch/intern/soundsystem/SND_3d.cpp
branches/sound-branch/source/gameengine/Audio/SND_GameDefines.h
Removed Paths:
-------------
branches/sound-branch/projectfiles_vc7/gameengine/audio/KX_audio/
Added: branches/sound-branch/intern/soundsystem/SND_3d.cpp
===================================================================
--- branches/sound-branch/intern/soundsystem/SND_3d.cpp (rev 0)
+++ branches/sound-branch/intern/soundsystem/SND_3d.cpp 2008-07-28 00:45:16 UTC (rev 15828)
@@ -0,0 +1,31 @@
+#include "SND_internal.h"
+
+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()
+{
+ return gSndCfg.mListenerGain;
+}
+
+float SND_GetDopplerVelocity()
+{
+ return gSndCfg.mListenerDopplerVelocity;
+}
+
+float SND_GetDopplerFactor()
+{
+ 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 00:21:34 UTC (rev 15827)
+++ branches/sound-branch/intern/soundsystem/SND_C-api.h 2008-07-28 00:45:16 UTC (rev 15828)
@@ -100,6 +100,14 @@
extern void SND_SoundStopAll(void);
+//positional audio stuff
+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();
+
#ifdef __cplusplus
}
#endif
Modified: branches/sound-branch/intern/soundsystem/SND_internal.h
===================================================================
--- branches/sound-branch/intern/soundsystem/SND_internal.h 2008-07-28 00:21:34 UTC (rev 15827)
+++ branches/sound-branch/intern/soundsystem/SND_internal.h 2008-07-28 00:45:16 UTC (rev 15828)
@@ -100,6 +100,11 @@
void *mCallbackUserData2;
int mMixBufferSampleRate;
+
+ //3d listener stuff
+ float mListenerGain;
+ float mListenerDopplerVelocity;
+ float mListenernDopplerFactor;
};
extern SND_Config gSndCfg;
Modified: branches/sound-branch/intern/soundsystem/make/msvc_7_0/soundsystem.vcproj
===================================================================
--- branches/sound-branch/intern/soundsystem/make/msvc_7_0/soundsystem.vcproj 2008-07-28 00:21:34 UTC (rev 15827)
+++ branches/sound-branch/intern/soundsystem/make/msvc_7_0/soundsystem.vcproj 2008-07-28 00:45:16 UTC (rev 15828)
@@ -251,6 +251,9 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
+ RelativePath="..\..\SND_3d.cpp">
+ </File>
+ <File
RelativePath="..\..\SND_device.cpp">
</File>
<File
Modified: branches/sound-branch/projectfiles_vc7/blender/blender.sln
===================================================================
--- branches/sound-branch/projectfiles_vc7/blender/blender.sln 2008-07-28 00:21:34 UTC (rev 15827)
+++ branches/sound-branch/projectfiles_vc7/blender/blender.sln 2008-07-28 00:45:16 UTC (rev 15828)
@@ -237,6 +237,10 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KX_audio", "..\gameengine\audio\KX_audio.vcproj", "{E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
3D Plugin Debug = 3D Plugin Debug
@@ -248,6 +252,8 @@
Debug = Debug
Release = Release
EndGlobalSection
+ GlobalSection(ProjectDependencies) = postSolution
+ EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.3D Plugin Debug.ActiveCfg = Blender Debug|Win32
{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.3D Plugin Release.ActiveCfg = Blender Release|Win32
@@ -805,6 +811,22 @@
{4C3AB78A-52CA-4276-A041-39776E52D8C8}.Debug.Build.0 = Blender Debug|Win32
{4C3AB78A-52CA-4276-A041-39776E52D8C8}.Release.ActiveCfg = Blender Release|Win32
{4C3AB78A-52CA-4276-A041-39776E52D8C8}.Release.Build.0 = Blender Release|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.3D Plugin Debug.ActiveCfg = Debug|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.3D Plugin Debug.Build.0 = Debug|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.3D Plugin Release.ActiveCfg = Release|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.3D Plugin Release.Build.0 = Release|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.Blender Debug.ActiveCfg = Debug|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.Blender Debug.Build.0 = Debug|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.Blender Release.ActiveCfg = Release|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.Blender Release.Build.0 = Release|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.BlenderPlayer Debug.ActiveCfg = Debug|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.BlenderPlayer Debug.Build.0 = Debug|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.BlenderPlayer Release.ActiveCfg = Release|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.BlenderPlayer Release.Build.0 = Release|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.Debug.ActiveCfg = Debug|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.Debug.Build.0 = Debug|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.Release.ActiveCfg = Release|Win32
+ {E45647DC-5E62-4C4B-854A-CC2B4A2C0DC6}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Modified: branches/sound-branch/projectfiles_vc7/gameengine/audio/KX_audio.vcproj
===================================================================
--- branches/sound-branch/projectfiles_vc7/gameengine/audio/KX_audio.vcproj 2008-07-28 00:21:34 UTC (rev 15827)
+++ branches/sound-branch/projectfiles_vc7/gameengine/audio/KX_audio.vcproj 2008-07-28 00:45:16 UTC (rev 15828)
@@ -99,61 +99,40 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
<File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameCDObject.cpp">
+ RelativePath="..\..\..\source\gameengine\Audio\SND_GameCDObject.cpp">
</File>
<File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameIdObject.cpp">
+ RelativePath="..\..\..\source\gameengine\Audio\SND_GameScene.cpp">
</File>
<File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameScene.cpp">
+ RelativePath="..\..\..\source\gameengine\Audio\SND_GameSoundListener.cpp">
</File>
<File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameSoundListener.cpp">
+ RelativePath="..\..\..\source\gameengine\Audio\SND_GameSoundObject.cpp">
</File>
- <File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameSoundObject.cpp">
- </File>
- <File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameUtils.cpp">
- </File>
- <File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameWaveCache.cpp">
- </File>
- <File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameWaveSlot.cpp">
- </File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameCDObject.h">
+ RelativePath="..\..\..\source\gameengine\Audio\SND_GameCDObject.h">
</File>
<File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameIdObject.h">
+ RelativePath="..\..\..\source\gameengine\Audio\SND_GameDefines.h">
</File>
<File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameObject.h">
+ RelativePath="..\..\..\source\gameengine\Audio\SND_GameObject.h">
</File>
<File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameScene.h">
+ RelativePath="..\..\..\source\gameengine\Audio\SND_GameScene.h">
</File>
<File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameSoundListener.h">
+ RelativePath="..\..\..\source\gameengine\Audio\SND_GameSoundListener.h">
</File>
<File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameSoundObject.h">
+ RelativePath="..\..\..\source\gameengine\Audio\SND_GameSoundObject.h">
</File>
- <File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameUtils.h">
- </File>
- <File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameWaveCache.h">
- </File>
- <File
- RelativePath="..\..\..\..\source\gameengine\Audio\SND_GameWaveSlot.h">
- </File>
</Filter>
</Files>
<Globals>
Modified: branches/sound-branch/source/blender/include/BAU_soundsystem.h
===================================================================
--- branches/sound-branch/source/blender/include/BAU_soundsystem.h 2008-07-28 00:21:34 UTC (rev 15827)
+++ branches/sound-branch/source/blender/include/BAU_soundsystem.h 2008-07-28 00:45:16 UTC (rev 15828)
@@ -59,7 +59,7 @@
// bSound functions
// hint: a bSound->sample cant be NULL, always have to be a valid pointer
-struct bSound* audio_sound_new(char *name);
+struct bSound* audio_sound_new(const char *name);
void audio_sound_delete(struct bSound *sound);
struct bSound* audio_sound_clone(struct bSound *originalsound);
struct bSound* audio_sound_findbyid(char *id_name);
Modified: branches/sound-branch/source/blender/src/soundsystem.c
===================================================================
--- branches/sound-branch/source/blender/src/soundsystem.c 2008-07-28 00:21:34 UTC (rev 15827)
+++ branches/sound-branch/source/blender/src/soundsystem.c 2008-07-28 00:45:16 UTC (rev 15828)
@@ -466,7 +466,7 @@
return SND_SoundGetVisualPCMData( (SND_SoundIHandle)sample->snd_sample );
}
-struct bSound* audio_sound_new( char *name )
+struct bSound* audio_sound_new(const char *name )
{
bSound *sound = NULL;
int len;
Modified: branches/sound-branch/source/gameengine/Audio/SND_GameCDObject.cpp
===================================================================
--- branches/sound-branch/source/gameengine/Audio/SND_GameCDObject.cpp 2008-07-28 00:21:34 UTC (rev 15827)
+++ branches/sound-branch/source/gameengine/Audio/SND_GameCDObject.cpp 2008-07-28 00:45:16 UTC (rev 15828)
@@ -32,7 +32,7 @@
*/
#include "SND_GameCDObject.h"
-#include "SND_internal.h"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list