TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

SFX API Changes

Browse source 
DSound has since been deprecated and xaudio2 would require us to write our own 3d spatialization and mixer
Load devices the same way we load in the gfx end
setup sfx provider
run sfx devices on startup
various fixes around sfx null device
added the bitrate and samplerate globals
added the hrtf global code is in to use this but not setup yet
Adds speed of sound to the sound system
SFXAmbience now has a property for speed of sound for different mediums, can also be set directly
This commit is contained in:
marauder2k7 2026-03-13 08:05:42 +00:00
parent 1c6409a485
commit 974f217b96
53 changed files with 1885 additions and 6409 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Engine/source/sfx/null/sfxNullDevice.cpp
View file

@ -24,15 +24,30 @@
#include "sfx/null/sfxNullBuffer.h"
#include "sfx/sfxInternal.h"
SFXNullDevice::SFXNullDevice( SFXProvider* provider,
String name,
bool useHardware,
S32 maxBuffers )
: SFXDevice( name, provider, useHardware, maxBuffers )
class SFXNULLRegisterProvider
{
mMaxBuffers = getMax( maxBuffers, 8 );
public:
SFXNULLRegisterProvider()
{
SFXSystem::getRegisterProviderSignal().notify(&SFXNullDevice::enumerateProviders);
}
};
static SFXNULLRegisterProvider pSFXNULLRegisterProvider;
SFXProvider::CreateProviderInstanceDelegate SFXNullDevice::mCreateDeviceInstance(SFXNullDevice::createInstance);
SFXDevice* SFXNullDevice::createInstance(U32 providerIndex)
{
SFXNullDevice* dev = new SFXNullDevice(providerIndex);
return dev;
}
SFXNullDevice::SFXNullDevice( U32 providerIndex )
{
mMaxBuffers = 8;
}
SFXNullDevice::~SFXNullDevice()
@ -65,6 +80,17 @@ SFXVoice* SFXNullDevice::createVoice( bool is3D, SFXBuffer *buffer )
return voice;
}
void SFXNullDevice::enumerateProviders(Vector<SFXProvider*>& providerList)
{
SFXProvider* toAdd = new SFXProvider;
toAdd->mName = String::ToString("SFX Null Device");
toAdd->mIndex = providerList.size();
toAdd->mDeviceType = Output;
toAdd->mType = NullProvider;
toAdd->mCreateDeviceInstanceDelegate = mCreateDeviceInstance;
providerList.push_back(toAdd);
}
void SFXNullDevice::update()
{
// Do nothing. Prevent SFXDevice from running

33
Engine/source/sfx/null/sfxNullDevice.h
View file

@ -23,8 +23,6 @@
#ifndef _SFXNULLDEVICE_H_
#define _SFXNULLDEVICE_H_
class SFXProvider;
#ifndef _SFXDEVICE_H_
#include "sfx/sfxDevice.h"
#endif
@ -37,27 +35,28 @@ class SFXProvider;
#ifndef _SFXNULLVOICE_H_
#include "sfx/null/sfxNullVoice.h"
#endif
#ifndef _SFXSYSTEM_H_
#include "sfx/sfxSystem.h"
#endif
class SFXNullDevice : public SFXDevice
{
typedef SFXDevice Parent;
protected:
static SFXProvider::CreateProviderInstanceDelegate mCreateDeviceInstance;
public:
public:
static void enumerateProviders(Vector<SFXProvider*>& providerList);
SFXNullDevice( U32 providerIndex );
static SFXDevice* createInstance(U32 adapterIndex);
virtual ~SFXNullDevice();
SFXNullDevice( SFXProvider* provider,
String name,
bool useHardware,
S32 maxBuffers );
public:
virtual ~SFXNullDevice();
public:
// SFXDevice.
SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description ) override;
SFXVoice* createVoice( bool is3D, SFXBuffer *buffer ) override;
void update() override;
// SFXDevice.
SFXBuffer* createBuffer( const ThreadSafeRef< SFXStream >& stream, SFXDescription* description ) override;
SFXVoice* createVoice( bool is3D, SFXBuffer *buffer ) override;
void update() override;
};
#endif // _SFXNULLDEVICE_H_
#endif // _SFXNULLDEVICE_H_

98
Engine/source/sfx/null/sfxNullProvider.cpp
View file

@ -1,98 +0,0 @@
//-----------------------------------------------------------------------------
// Copyright (c) 2012 GarageGames, LLC
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to
// deal in the Software without restriction, including without limitation the
// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
// sell copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#include "sfx/sfxProvider.h"
#include "sfx/null/sfxNullDevice.h"
#include "core/strings/stringFunctions.h"
#include "core/module.h"
class SFXNullProvider : public SFXProvider
{
public:
SFXNullProvider()
: SFXProvider( "Null" ) {}
virtual ~SFXNullProvider();
protected:
void addDeviceDesc( const String& name, const String& desc );
void init() override;
public:
SFXDevice* createDevice( const String& deviceName, bool useHardware, S32 maxBuffers ) override;
};
MODULE_BEGIN( SFXNull )
MODULE_INIT_BEFORE( SFX )
MODULE_SHUTDOWN_AFTER( SFX )
SFXNullProvider* mProvider;
MODULE_INIT
{
mProvider = new SFXNullProvider;
}
MODULE_SHUTDOWN
{
delete mProvider;
}
MODULE_END;
void SFXNullProvider::init()
{
regProvider( this );
addDeviceDesc( "Null", "SFX Null Device" );
}
SFXNullProvider::~SFXNullProvider()
{
}
void SFXNullProvider::addDeviceDesc( const String& name, const String& desc )
{
SFXDeviceInfo* info = new SFXDeviceInfo;
info->internalName = desc;
info->name = "Null Device";
info->driver = name;
info->hasHardware = false;
info->maxBuffers = 8;
mDeviceInfo.push_back( info );
}
SFXDevice* SFXNullProvider::createDevice( const String& deviceName, bool useHardware, S32 maxBuffers )
{
SFXDeviceInfo* info = _findDeviceInfo( deviceName );
// Do we find one to create?
if ( info )
return new SFXNullDevice( this, info->internalName, useHardware, maxBuffers );
return NULL;
}