AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-11 05:20:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

doppler take 2

Browse Source
This commit is contained in:
epochwon 2025-05-02 18:08:08 -04:00
parent abbbeefdbd
commit c541cb96cc
13 changed files with 111 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/launcher/settingspage.cpp
View File

@ -293,6 +293,7 @@ bool Launcher::SettingsPage::loadSettings()
} }
} }
loadSettingBool(Settings::sound().mCameraListener, *cameraListenerCheckBox); loadSettingBool(Settings::sound().mCameraListener, *cameraListenerCheckBox);
dopplerSpinBox->setValue(Settings::sound().mDopplerFactor);
} }
// Interface Changes // Interface Changes
@ -486,6 +487,8 @@ void Launcher::SettingsPage::saveSettings()
const bool cCameraListener = cameraListenerCheckBox->checkState() != Qt::Unchecked; const bool cCameraListener = cameraListenerCheckBox->checkState() != Qt::Unchecked;
Settings::sound().mCameraListener.set(cCameraListener); Settings::sound().mCameraListener.set(cCameraListener);
Settings::sound().mDopplerFactor.set(dopplerSpinBox->value());
} }
// Interface Changes // Interface Changes

44
apps/launcher/ui/settingspage.ui
View File

@ -1235,6 +1235,50 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout">
<item>
<widget class="QLabel" name="dopplerLabel">
<property name="toolTip">
<string>Controls the strength of the doppler effect. Zero means it is completely disabled.</string>
</property>
<property name="text">
<string>Doppler Factor</string>
</property>
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="dopplerSpinBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>283</width>
<height>0</height>
</size>
</property>
<property name="decimals">
<number>2</number>
</property>
<property name="minimum">
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>1.000000000000000</double>
</property>
<property name="singleStep">
<double>0.010000000000000</double>
</property>
<property name="value">
<double>0.250000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<spacer> <spacer>
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>

2
apps/openmw/mwbase/soundmanager.hpp
View File

@ -234,6 +234,8 @@ namespace MWBase
const osg::Vec3f& pos, const osg::Vec3f& dir, const osg::Vec3f& up, bool underwater) const osg::Vec3f& pos, const osg::Vec3f& dir, const osg::Vec3f& up, bool underwater)
= 0; = 0;
virtual void setListenerVel(const osg::Vec3f& vel) = 0;
virtual void updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated) = 0; virtual void updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated) = 0;
void setSimulationTimeScale(float scale) { mSimulationTimeScale = scale; } void setSimulationTimeScale(float scale) { mSimulationTimeScale = scale; }

24
apps/openmw/mwsound/openaloutput.cpp
View File

@ -15,6 +15,7 @@
#include <components/misc/constants.hpp> #include <components/misc/constants.hpp>
#include <components/misc/resourcehelpers.hpp> #include <components/misc/resourcehelpers.hpp>
#include <components/misc/thread.hpp> #include <components/misc/thread.hpp>
#include <components/settings/values.hpp>
#include <components/vfs/manager.hpp> #include <components/vfs/manager.hpp>
#include "efxpresets.h" #include "efxpresets.h"
@ -1137,12 +1138,13 @@ namespace MWSound
alSourcef(source, AL_GAIN, gain); alSourcef(source, AL_GAIN, gain);
alSourcef(source, AL_PITCH, pitch); alSourcef(source, AL_PITCH, pitch);
alSourcef(source, AL_DOPPLER_FACTOR, 0.0f);
alSourcefv(source, AL_POSITION, pos.ptr()); alSourcefv(source, AL_POSITION, pos.ptr());
alSource3f(source, AL_DIRECTION, 0.0f, 0.0f, 0.0f); alSource3f(source, AL_DIRECTION, 0.0f, 0.0f, 0.0f);
alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f); alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f);
} }
void OpenALOutput::initCommon3D(ALuint source, const osg::Vec3f& pos, ALfloat mindist, ALfloat maxdist, void OpenALOutput::initCommon3D(ALuint source, const osg::Vec3f& pos, const osg::Vec3f& vel, ALfloat mindist, ALfloat maxdist,
ALfloat gain, ALfloat pitch, bool loop, bool useenv) ALfloat gain, ALfloat pitch, bool loop, bool useenv)
{ {
alSourcef(source, AL_REFERENCE_DISTANCE, mindist); alSourcef(source, AL_REFERENCE_DISTANCE, mindist);
@ -1177,13 +1179,14 @@ namespace MWSound
alSourcef(source, AL_GAIN, gain); alSourcef(source, AL_GAIN, gain);
alSourcef(source, AL_PITCH, pitch); alSourcef(source, AL_PITCH, pitch);
alSourcef(source, AL_DOPPLER_FACTOR, Settings::sound().mDopplerFactor);
alSourcefv(source, AL_POSITION, pos.ptr()); alSourcefv(source, AL_POSITION, pos.ptr());
alSource3f(source, AL_DIRECTION, 0.0f, 0.0f, 0.0f); alSource3f(source, AL_DIRECTION, 0.0f, 0.0f, 0.0f);
alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f); alSourcefv(source, AL_VELOCITY, vel.ptr());
} }
void OpenALOutput::updateCommon( void OpenALOutput::updateCommon(
ALuint source, const osg::Vec3f& pos, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv) ALuint source, const osg::Vec3f& pos, const osg::Vec3f& vel, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv)
{ {
if (useenv && mListenerEnv == Env_Underwater && !mWaterFilter) if (useenv && mListenerEnv == Env_Underwater && !mWaterFilter)
{ {
@ -1195,7 +1198,7 @@ namespace MWSound
alSourcef(source, AL_PITCH, pitch); alSourcef(source, AL_PITCH, pitch);
alSourcefv(source, AL_POSITION, pos.ptr()); alSourcefv(source, AL_POSITION, pos.ptr());
alSource3f(source, AL_DIRECTION, 0.0f, 0.0f, 0.0f); alSource3f(source, AL_DIRECTION, 0.0f, 0.0f, 0.0f);
alSource3f(source, AL_VELOCITY, 0.0f, 0.0f, 0.0f); alSourcefv(source, AL_VELOCITY, vel.ptr());
} }
bool OpenALOutput::playSound(Sound* sound, Sound_Handle data, float offset) bool OpenALOutput::playSound(Sound* sound, Sound_Handle data, float offset)
@ -1248,7 +1251,7 @@ namespace MWSound
} }
source = mFreeSources.front(); source = mFreeSources.front();
initCommon3D(source, sound->getPosition(), sound->getMinDistance(), sound->getMaxDistance(), initCommon3D(source, sound->getPosition(), sound->getVelocity(), sound->getMinDistance(), sound->getMaxDistance(),
sound->getRealVolume(), getTimeScaledPitch(sound), sound->getIsLooping(), sound->getUseEnv()); sound->getRealVolume(), getTimeScaledPitch(sound), sound->getIsLooping(), sound->getUseEnv());
alSourcei(source, AL_BUFFER, GET_PTRID(data)); alSourcei(source, AL_BUFFER, GET_PTRID(data));
alSourcef(source, AL_SEC_OFFSET, offset); alSourcef(source, AL_SEC_OFFSET, offset);
@ -1312,7 +1315,7 @@ namespace MWSound
return; return;
ALuint source = GET_PTRID(sound->mHandle); ALuint source = GET_PTRID(sound->mHandle);
updateCommon(source, sound->getPosition(), sound->getMaxDistance(), sound->getRealVolume(), updateCommon(source, sound->getPosition(), sound->getVelocity(), sound->getMaxDistance(), sound->getRealVolume(),
getTimeScaledPitch(sound), sound->getUseEnv()); getTimeScaledPitch(sound), sound->getUseEnv());
getALError(); getALError();
} }
@ -1360,7 +1363,7 @@ namespace MWSound
if (sound->getIsLooping()) if (sound->getIsLooping())
Log(Debug::Warning) << "Warning: cannot loop stream \"" << decoder->getName() << "\""; Log(Debug::Warning) << "Warning: cannot loop stream \"" << decoder->getName() << "\"";
initCommon3D(source, sound->getPosition(), sound->getMinDistance(), sound->getMaxDistance(), initCommon3D(source, sound->getPosition(), sound->getVelocity(), sound->getMinDistance(), sound->getMaxDistance(),
sound->getRealVolume(), getTimeScaledPitch(sound), false, sound->getUseEnv()); sound->getRealVolume(), getTimeScaledPitch(sound), false, sound->getUseEnv());
if (getALError() != AL_NO_ERROR) if (getALError() != AL_NO_ERROR)
return false; return false;
@ -1443,7 +1446,7 @@ namespace MWSound
OpenAL_SoundStream* stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle); OpenAL_SoundStream* stream = reinterpret_cast<OpenAL_SoundStream*>(sound->mHandle);
ALuint source = stream->mSource; ALuint source = stream->mSource;
updateCommon(source, sound->getPosition(), sound->getMaxDistance(), sound->getRealVolume(), updateCommon(source, sound->getPosition(), sound->getVelocity(), sound->getMaxDistance(), sound->getRealVolume(),
getTimeScaledPitch(sound), sound->getUseEnv()); getTimeScaledPitch(sound), sound->getUseEnv());
getALError(); getALError();
} }
@ -1459,12 +1462,13 @@ namespace MWSound
} }
void OpenALOutput::updateListener( void OpenALOutput::updateListener(
const osg::Vec3f& pos, const osg::Vec3f& atdir, const osg::Vec3f& updir, Environment env) const osg::Vec3f& pos, const osg::Vec3f& atdir, const osg::Vec3f& updir, const osg::Vec3f& vel, Environment env)
{ {
if (mContext) if (mContext)
{ {
ALfloat orient[6] = { atdir.x(), atdir.y(), atdir.z(), updir.x(), updir.y(), updir.z() }; ALfloat orient[6] = { atdir.x(), atdir.y(), atdir.z(), updir.x(), updir.y(), updir.z() };
alListenerfv(AL_POSITION, pos.ptr()); alListenerfv(AL_POSITION, pos.ptr());
alListenerfv(AL_VELOCITY, vel.ptr());
alListenerfv(AL_ORIENTATION, orient); alListenerfv(AL_ORIENTATION, orient);
if (env != mListenerEnv) if (env != mListenerEnv)
@ -1497,6 +1501,7 @@ namespace MWSound
} }
mListenerPos = pos; mListenerPos = pos;
mListenerVel = vel;
mListenerEnv = env; mListenerEnv = env;
} }
@ -1583,6 +1588,7 @@ namespace MWSound
, mDevice(nullptr) , mDevice(nullptr)
, mContext(nullptr) , mContext(nullptr)
, mListenerPos(0.0f, 0.0f, 0.0f) , mListenerPos(0.0f, 0.0f, 0.0f)
, mListenerVel(0.0f, 0.0f, 0.0f)
, mListenerEnv(Env_Normal) , mListenerEnv(Env_Normal)
, mWaterFilter(0) , mWaterFilter(0)
, mWaterEffect(0) , mWaterEffect(0)

7
apps/openmw/mwsound/openaloutput.hpp
View File

@ -46,6 +46,7 @@ namespace MWSound
StreamVec mActiveStreams; StreamVec mActiveStreams;
osg::Vec3f mListenerPos; osg::Vec3f mListenerPos;
osg::Vec3f mListenerVel;
Environment mListenerEnv; Environment mListenerEnv;
ALuint mWaterFilter; ALuint mWaterFilter;
@ -64,11 +65,11 @@ namespace MWSound
std::unique_ptr<DefaultDeviceThread> mDefaultDeviceThread; std::unique_ptr<DefaultDeviceThread> mDefaultDeviceThread;
void initCommon2D(ALuint source, const osg::Vec3f& pos, ALfloat gain, ALfloat pitch, bool loop, bool useenv); void initCommon2D(ALuint source, const osg::Vec3f& pos, ALfloat gain, ALfloat pitch, bool loop, bool useenv);
void initCommon3D(ALuint source, const osg::Vec3f& pos, ALfloat mindist, ALfloat maxdist, ALfloat gain, void initCommon3D(ALuint source, const osg::Vec3f& pos, const osg::Vec3f& vel, ALfloat mindist, ALfloat maxdist, ALfloat gain,
ALfloat pitch, bool loop, bool useenv); ALfloat pitch, bool loop, bool useenv);
void updateCommon( void updateCommon(
ALuint source, const osg::Vec3f& pos, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv); ALuint source, const osg::Vec3f& pos, const osg::Vec3f& vel, ALfloat maxdist, ALfloat gain, ALfloat pitch, bool useenv);
float getTimeScaledPitch(SoundBase* sound); float getTimeScaledPitch(SoundBase* sound);
@ -109,7 +110,7 @@ namespace MWSound
void finishUpdate() override; void finishUpdate() override;
void updateListener( void updateListener(
const osg::Vec3f& pos, const osg::Vec3f& atdir, const osg::Vec3f& updir, Environment env) override; const osg::Vec3f& pos, const osg::Vec3f& atdir, const osg::Vec3f& updir, const osg::Vec3f& vel, Environment env) override;
void pauseSounds(int types) override; void pauseSounds(int types) override;
void resumeSounds(int types) override; void resumeSounds(int types) override;

6
apps/openmw/mwsound/sound.hpp
View File

@ -31,6 +31,8 @@ namespace MWSound
struct SoundParams struct SoundParams
{ {
osg::Vec3f mPos; osg::Vec3f mPos;
osg::Vec3f mLastPos;
osg::Vec3f mVel;
float mVolume = 1.0f; float mVolume = 1.0f;
float mBaseVolume = 1.0f; float mBaseVolume = 1.0f;
float mPitch = 1.0f; float mPitch = 1.0f;
@ -57,6 +59,8 @@ namespace MWSound
public: public:
void setPosition(const osg::Vec3f& pos) { mParams.mPos = pos; } void setPosition(const osg::Vec3f& pos) { mParams.mPos = pos; }
void setLastPosition(const osg::Vec3f& lastpos) { mParams.mLastPos = lastpos; }
void setVelocity(const osg::Vec3f& vel) { mParams.mVel = vel; }
void setVolume(float volume) { mParams.mVolume = volume; } void setVolume(float volume) { mParams.mVolume = volume; }
void setBaseVolume(float volume) { mParams.mBaseVolume = volume; } void setBaseVolume(float volume) { mParams.mBaseVolume = volume; }
void setFadeout(float duration) { setFade(duration, 0.0, Play_StopAtFadeEnd); } void setFadeout(float duration) { setFade(duration, 0.0, Play_StopAtFadeEnd); }
@ -150,6 +154,8 @@ namespace MWSound
} }
const osg::Vec3f& getPosition() const { return mParams.mPos; } const osg::Vec3f& getPosition() const { return mParams.mPos; }
const osg::Vec3f& getLastPosition() const { return mParams.mLastPos; }
const osg::Vec3f& getVelocity() const {return mParams.mVel; }
float getRealVolume() const { return mParams.mVolume * mParams.mBaseVolume * mParams.mFadeVolume; } float getRealVolume() const { return mParams.mVolume * mParams.mBaseVolume * mParams.mFadeVolume; }
float getPitch() const { return mParams.mPitch; } float getPitch() const { return mParams.mPitch; }
float getMinDistance() const { return mParams.mMinDistance; } float getMinDistance() const { return mParams.mMinDistance; }

23
apps/openmw/mwsound/soundmanagerimp.cpp
View File

@ -10,6 +10,7 @@
#include <components/debug/debuglog.hpp> #include <components/debug/debuglog.hpp>
#include <components/misc/resourcehelpers.hpp> #include <components/misc/resourcehelpers.hpp>
#include <components/misc/rng.hpp> #include <components/misc/rng.hpp>
#include <components/misc/strings/conversion.hpp>
#include <components/settings/values.hpp> #include <components/settings/values.hpp>
#include <components/vfs/manager.hpp> #include <components/vfs/manager.hpp>
#include <components/vfs/pathutil.hpp> #include <components/vfs/pathutil.hpp>
@ -119,6 +120,7 @@ namespace MWSound
, mListenerPos(0, 0, 0) , mListenerPos(0, 0, 0)
, mListenerDir(1, 0, 0) , mListenerDir(1, 0, 0)
, mListenerUp(0, 0, 1) , mListenerUp(0, 0, 1)
, mListenerVel(0, 0, 0)
, mUnderwaterSound(nullptr) , mUnderwaterSound(nullptr)
, mNearWaterSound(nullptr) , mNearWaterSound(nullptr)
, mPlaybackPaused(false) , mPlaybackPaused(false)
@ -959,8 +961,16 @@ namespace MWSound
mUnderwaterSound = nullptr; mUnderwaterSound = nullptr;
} }
float physicsFramerate = 60.f;
if (const char* env = getenv("OPENMW_PHYSICS_FPS"))
{
if (const auto physFramerate = Misc::StringUtils::toNumeric<float>(env);
physFramerate.has_value() && *physFramerate > 0)
physicsFramerate = *physFramerate;
}
mOutput->startUpdate(); mOutput->startUpdate();
mOutput->updateListener(mListenerPos, mListenerDir, mListenerUp, env); mOutput->updateListener(mListenerPos, mListenerDir, mListenerUp, mListenerVel, env);
updateMusic(duration); updateMusic(duration);
@ -977,7 +987,11 @@ namespace MWSound
if (sound->getIs3D()) if (sound->getIs3D())
{ {
if (!ptr.isEmpty()) if (!ptr.isEmpty())
{
sound->setLastPosition(sound->getPosition());
sound->setPosition(ptr.getRefData().getPosition().asVec3()); sound->setPosition(ptr.getRefData().getPosition().asVec3());
sound->setVelocity((sound->getPosition() - sound->getLastPosition()) * physicsFramerate);
}
cull3DSound(sound); cull3DSound(sound);
} }
@ -1013,8 +1027,10 @@ namespace MWSound
{ {
if (!ptr.isEmpty()) if (!ptr.isEmpty())
{ {
sound->setLastPosition(sound->getPosition());
MWBase::World* world = MWBase::Environment::get().getWorld(); MWBase::World* world = MWBase::Environment::get().getWorld();
sound->setPosition(world->getActorHeadTransform(ptr).getTrans()); sound->setPosition(world->getActorHeadTransform(ptr).getTrans());
sound->setVelocity((sound->getPosition() - sound->getLastPosition()) * physicsFramerate);
} }
cull3DSound(sound); cull3DSound(sound);
@ -1153,6 +1169,11 @@ namespace MWSound
mWaterSoundUpdater.setUnderwater(underwater); mWaterSoundUpdater.setUnderwater(underwater);
} }
void SoundManager::setListenerVel(const osg::Vec3f& vel)
{
mListenerVel = vel;
}
void SoundManager::updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated) void SoundManager::updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated)
{ {
SoundMap::iterator snditer = mActiveSounds.find(old.mRef); SoundMap::iterator snditer = mActiveSounds.find(old.mRef);

3
apps/openmw/mwsound/soundmanagerimp.hpp
View File

@ -92,6 +92,7 @@ namespace MWSound
osg::Vec3f mListenerPos; osg::Vec3f mListenerPos;
osg::Vec3f mListenerDir; osg::Vec3f mListenerDir;
osg::Vec3f mListenerUp; osg::Vec3f mListenerUp;
osg::Vec3f mListenerVel;
int mPausedSoundTypes[BlockerType::MaxCount] = {}; int mPausedSoundTypes[BlockerType::MaxCount] = {};
@ -283,6 +284,8 @@ namespace MWSound
void setListenerPosDir( void setListenerPosDir(
const osg::Vec3f& pos, const osg::Vec3f& dir, const osg::Vec3f& up, bool underwater) override; const osg::Vec3f& pos, const osg::Vec3f& dir, const osg::Vec3f& up, bool underwater) override;
void setListenerVel(const osg::Vec3f& vel) override;
void updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated) override; void updatePtr(const MWWorld::ConstPtr& old, const MWWorld::ConstPtr& updated) override;
void clear() override; void clear() override;

2
apps/openmw/mwsound/soundoutput.hpp
View File

@ -62,7 +62,7 @@ namespace MWSound
virtual void finishUpdate() = 0; virtual void finishUpdate() = 0;
virtual void updateListener( virtual void updateListener(
const osg::Vec3f& pos, const osg::Vec3f& atdir, const osg::Vec3f& updir, Environment env) const osg::Vec3f& pos, const osg::Vec3f& atdir, const osg::Vec3f& updir, const osg::Vec3f& vel, Environment env)
= 0; = 0;
virtual void pauseSounds(int types) = 0; virtual void pauseSounds(int types) = 0;

5
apps/openmw/mwworld/projectilemanager.cpp
View File

@ -461,6 +461,11 @@ namespace MWWorld
update(magicBoltState, duration); update(magicBoltState, duration);
for (const auto& sound : magicBoltState.mSounds)
{
sound->setVelocity(direction * speed);
}
// For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit // For AI actors, get combat targets to use in the ray cast. Only those targets will return a positive hit
// result. // result.
std::vector<MWWorld::Ptr> targetActors; std::vector<MWWorld::Ptr> targetActors;

2
apps/openmw/mwworld/worldimp.cpp
View File

@ -1467,6 +1467,8 @@ namespace MWWorld
void World::queueMovement(const Ptr& ptr, const osg::Vec3f& velocity) void World::queueMovement(const Ptr& ptr, const osg::Vec3f& velocity)
{ {
mPhysics->queueObjectMovement(ptr, velocity); mPhysics->queueObjectMovement(ptr, velocity);
if(ptr == MWMechanics::getPlayer())
MWBase::Environment::get().getSoundManager()->setListenerVel(velocity);
} }
void World::updateAnimatedCollisionShape(const Ptr& ptr) void World::updateAnimatedCollisionShape(const Ptr& ptr)

1
components/settings/categories/sound.hpp
View File

@ -24,6 +24,7 @@ namespace Settings
SettingValue<HrtfMode> mHrtfEnable{ mIndex, "Sound", "hrtf enable" }; SettingValue<HrtfMode> mHrtfEnable{ mIndex, "Sound", "hrtf enable" };
SettingValue<std::string> mHrtf{ mIndex, "Sound", "hrtf" }; SettingValue<std::string> mHrtf{ mIndex, "Sound", "hrtf" };
SettingValue<bool> mCameraListener{ mIndex, "Sound", "camera listener" }; SettingValue<bool> mCameraListener{ mIndex, "Sound", "camera listener" };
SettingValue<float> mDopplerFactor{ mIndex, "Sound", "doppler factor", makeClampSanitizerFloat(0, 1) };
}; };
} }

3
files/settings-default.cfg
View File

@ -627,6 +627,9 @@ hrtf =
# Specifies whether to use camera as audio listener # Specifies whether to use camera as audio listener
camera listener = false camera listener = false
# Specifies strength of doppler effect
doppler factor = 0.25
[Video] [Video]
# Resolution of the OpenMW window or screen. # Resolution of the OpenMW window or screen.