diff options
author | Loek Le Blansch <loek@pipeframe.xyz> | 2024-12-05 17:12:56 +0100 |
---|---|---|
committer | Loek Le Blansch <loek@pipeframe.xyz> | 2024-12-05 17:12:56 +0100 |
commit | 1e9e564f3806d07c7b0dc445c4ae2e738350fc83 (patch) | |
tree | c7d67cef8ae898288ac769eb8ee8f3252369d736 /src | |
parent | 5072b4cc9bf56a4764c9bbd2bb748b6d3d511374 (diff) |
`make format`
Diffstat (limited to 'src')
-rw-r--r-- | src/crepe/api/AudioSource.h | 3 | ||||
-rw-r--r-- | src/crepe/facade/SoundContext.cpp | 1 | ||||
-rw-r--r-- | src/crepe/facade/SoundContext.h | 3 | ||||
-rw-r--r-- | src/crepe/facade/SoundHandle.h | 3 | ||||
-rw-r--r-- | src/crepe/system/AudioSystem.cpp | 4 | ||||
-rw-r--r-- | src/test/ResourceManagerTest.cpp | 9 |
6 files changed, 6 insertions, 17 deletions
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h index 7c1f161..b20e490 100644 --- a/src/crepe/api/AudioSource.h +++ b/src/crepe/api/AudioSource.h @@ -1,8 +1,8 @@ #pragma once #include "../Component.h" -#include "../types.h" #include "../facade/SoundHandle.h" +#include "../types.h" #include "Asset.h" #include "GameObject.h" @@ -69,7 +69,6 @@ private: //! \} //! This source's voice handle SoundHandle voice{}; - }; } // namespace crepe diff --git a/src/crepe/facade/SoundContext.cpp b/src/crepe/facade/SoundContext.cpp index d18afc6..b1f8cb3 100644 --- a/src/crepe/facade/SoundContext.cpp +++ b/src/crepe/facade/SoundContext.cpp @@ -34,4 +34,3 @@ void SoundContext::set_volume(const SoundHandle & handle, float volume) { void SoundContext::set_loop(const SoundHandle & handle, bool loop) { this->engine.setLooping(this->registry[handle], loop); } - diff --git a/src/crepe/facade/SoundContext.h b/src/crepe/facade/SoundContext.h index 102f928..d986c59 100644 --- a/src/crepe/facade/SoundContext.h +++ b/src/crepe/facade/SoundContext.h @@ -4,8 +4,8 @@ #include "../api/Config.h" -#include "SoundHandle.h" #include "Sound.h" +#include "SoundHandle.h" namespace crepe { @@ -76,7 +76,6 @@ private: std::unordered_map<SoundHandle, SoLoud::handle> registry; //! Unique handle counter SoundHandle next_handle = 0; - }; } // namespace crepe diff --git a/src/crepe/facade/SoundHandle.h b/src/crepe/facade/SoundHandle.h index 131d28c..b7925fc 100644 --- a/src/crepe/facade/SoundHandle.h +++ b/src/crepe/facade/SoundHandle.h @@ -9,5 +9,4 @@ namespace crepe { */ typedef size_t SoundHandle; -} - +} // namespace crepe diff --git a/src/crepe/system/AudioSystem.cpp b/src/crepe/system/AudioSystem.cpp index c1cde8b..b2c1dc6 100644 --- a/src/crepe/system/AudioSystem.cpp +++ b/src/crepe/system/AudioSystem.cpp @@ -58,8 +58,6 @@ void AudioSystem::update_last(AudioSource & component) { } SoundContext & AudioSystem::get_context() { - if (this->context == nullptr) - this->context = make_unique<SoundContext>(); + if (this->context == nullptr) this->context = make_unique<SoundContext>(); return *this->context.get(); } - diff --git a/src/test/ResourceManagerTest.cpp b/src/test/ResourceManagerTest.cpp index 0789ef0..44a5921 100644 --- a/src/test/ResourceManagerTest.cpp +++ b/src/test/ResourceManagerTest.cpp @@ -75,12 +75,7 @@ TEST_F(ResourceManagerTest, Persistent) { } TEST_F(ResourceManagerTest, UnmatchedType) { - EXPECT_NO_THROW({ - resource_manager.get<TestResource>(asset_a); - }); + EXPECT_NO_THROW({ resource_manager.get<TestResource>(asset_a); }); - EXPECT_THROW({ - resource_manager.get<Unrelated>(asset_a); - }, runtime_error); + EXPECT_THROW({ resource_manager.get<Unrelated>(asset_a); }, runtime_error); } - |