lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support dynamically changing 3d sound source position

Browse source
This commit is contained in:
Nikita Lisitsa 2022-10-02 15:18:10 +03:00
parent 28fbe8daf8
commit 4490123a64
2 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/audio/include/psemek/audio/3d.hpp
View file

@ -14,7 +14,13 @@ namespace psemek::audio
{ {
void set_position(geom::point<float, 3> const & position); void set_position(geom::point<float, 3> const & position);
virtual std::shared_ptr<effect> make_effect(geom::point<float, 3> const & position, float distance_factor); struct mono_effect
: effect
{
virtual void set_position(geom::point<float, 3> const & position) = 0;
};
virtual std::shared_ptr<mono_effect> make_effect(geom::point<float, 3> const & position, float distance_factor);
private: private:
geom::point<float, 3> position_; geom::point<float, 3> position_;

27
libs/audio/source/3d.cpp
View file

@ -10,10 +10,10 @@ namespace psemek::audio
namespace namespace
{ {
struct mono_impl struct mono_effect_impl
: effect : listener_3d_mono::mono_effect
{ {
mono_impl(geom::point<float, 3> const & source_position, geom::point<float, 3> & target_position, std::mutex & target_position_mutex, float distance_factor) mono_effect_impl(geom::point<float, 3> const & source_position, geom::point<float, 3> & target_position, std::mutex & target_position_mutex, float distance_factor)
: source_position_(source_position) : source_position_(source_position)
, target_position_(target_position) , target_position_(target_position)
, cached_target_position_(target_position) , cached_target_position_(target_position)
@ -37,15 +37,30 @@ namespace psemek::audio
cached_target_position_ = target_position_; cached_target_position_ = target_position_;
} }
float distance = geom::distance(cached_target_position_, source_position_) / distance_factor_; {
std::unique_lock lock{source_position_mutex_, std::try_to_lock};
if (lock.owns_lock())
cached_source_position_ = source_position_;
}
float distance = geom::distance(cached_target_position_, cached_source_position_) / distance_factor_;
float factor = std::min(1.f, 1.f / (1.f + distance * distance)); float factor = std::min(1.f, 1.f / (1.f + distance * distance));
for (std::size_t i = 0; i < count; ++i) for (std::size_t i = 0; i < count; ++i)
data[i] = pack(unpack(data[i]) * factor); data[i] = pack(unpack(data[i]) * factor);
} }
void set_position(geom::point<float, 3> const & position) override
{
std::lock_guard lock{source_position_mutex_};
source_position_ = position;
}
private: private:
std::mutex source_position_mutex_;
geom::point<float, 3> source_position_; geom::point<float, 3> source_position_;
geom::point<float, 3> cached_source_position_;
geom::point<float, 3> & target_position_; geom::point<float, 3> & target_position_;
geom::point<float, 3> cached_target_position_; geom::point<float, 3> cached_target_position_;
std::mutex & target_position_mutex_; std::mutex & target_position_mutex_;
@ -60,9 +75,9 @@ namespace psemek::audio
position_ = position; position_ = position;
} }
std::shared_ptr<effect> listener_3d_mono::make_effect(const geom::point<float, 3> &position, float distance_factor) std::shared_ptr<listener_3d_mono::mono_effect> listener_3d_mono::make_effect(const geom::point<float, 3> &position, float distance_factor)
{ {
return std::make_shared<mono_impl>(position, position_, position_mutex_, distance_factor); return std::make_shared<mono_effect_impl>(position, position_, position_mutex_, distance_factor);
} }
} }