diff options
author | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-10-01 20:16:04 +0200 |
---|---|---|
committer | heavydemon21 <nielsstunnebrink1@gmail.com> | 2024-10-01 20:16:04 +0200 |
commit | 7230b630025886939c726e07eba1a0b35511f687 (patch) | |
tree | aacfe3e427b8041fecc4562a39e9204e3429e8e5 /src/crepe/api | |
parent | ef44da3f5e9ca533782da5e185e69e28c295d226 (diff) | |
parent | 65eda52aa51017f6f7aad158c4f8b6e91054cf0d (diff) |
Merge branch 'loek/audio' into niels/resource-manager
Diffstat (limited to 'src/crepe/api')
-rw-r--r-- | src/crepe/api/AudioSource.cpp | 22 | ||||
-rw-r--r-- | src/crepe/api/AudioSource.h | 41 | ||||
-rw-r--r-- | src/crepe/api/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/crepe/api/Component.h | 10 | ||||
-rw-r--r-- | src/crepe/api/Resource.cpp | 14 | ||||
-rw-r--r-- | src/crepe/api/Resource.h | 24 |
6 files changed, 113 insertions, 1 deletions
diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp new file mode 100644 index 0000000..4d1b093 --- /dev/null +++ b/src/crepe/api/AudioSource.cpp @@ -0,0 +1,22 @@ +#include "AudioSource.h" + +#include "../Sound.h" +#include <memory> + +using namespace crepe::api; + +AudioSource::AudioSource(std::unique_ptr<Resource> audio_clip) { + this->_sound = std::make_unique<crepe::Sound>(std::move(audio_clip)); +} + +void AudioSource::play() { return this->play(false); } + +void AudioSource::play(bool looping) { + this->_sound->set_looping(looping); + this->_sound->play(); +} + +void AudioSource::stop() { + this->_sound->pause(); + this->_sound->rewind(); +} diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h new file mode 100644 index 0000000..4300c48 --- /dev/null +++ b/src/crepe/api/AudioSource.h @@ -0,0 +1,41 @@ +#pragma once + +#include <memory> + +#include "Component.h" +#include "Resource.h" + +namespace crepe { +class Sound; +} + +namespace crepe::api { + +//! Audio source component +class AudioSource : Component { +public: + AudioSource(std::unique_ptr<Resource> audio_clip); + virtual ~AudioSource() = default; + +public: + //! Start or resume this audio source + void play(); + void play(bool looping); + //! Stop this audio source + void stop(); + +public: + //! Sample file location + std::unique_ptr<Resource> audio_clip; + //! TODO: ????? + bool play_on_awake; + //! Repeat the current audio clip during playback + bool loop; + //! Normalized volume (0.0 - 1.0) + float volume; + +private: + std::unique_ptr<crepe::Sound> _sound; +}; + +} // namespace crepe::api diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt index 7b16fb1..4f3fada 100644 --- a/src/crepe/api/CMakeLists.txt +++ b/src/crepe/api/CMakeLists.txt @@ -13,5 +13,6 @@ target_sources(crepe PUBLIC FILE_SET HEADERS FILES Audio_asset.h spritesheet.h resource_manager.h + Component.h + AudioSource.h ) - diff --git a/src/crepe/api/Component.h b/src/crepe/api/Component.h new file mode 100644 index 0000000..d5e0499 --- /dev/null +++ b/src/crepe/api/Component.h @@ -0,0 +1,10 @@ +#pragma once + +namespace crepe::api { + +class Component { +public: + bool active; +}; + +} // namespace crepe::api diff --git a/src/crepe/api/Resource.cpp b/src/crepe/api/Resource.cpp new file mode 100644 index 0000000..1a647ce --- /dev/null +++ b/src/crepe/api/Resource.cpp @@ -0,0 +1,14 @@ +#include <filesystem> + +#include "Resource.h" + +using namespace crepe::api; + +Resource::Resource(const std::string & src) { + this->src = std::filesystem::canonical(src); + this->file = std::ifstream(this->src, std::ios::in | std::ios::binary); +} + +const std::istream & Resource::read() { return this->file; } + +const char * Resource::canonical() { return this->src.c_str(); } diff --git a/src/crepe/api/Resource.h b/src/crepe/api/Resource.h new file mode 100644 index 0000000..f2b2a0e --- /dev/null +++ b/src/crepe/api/Resource.h @@ -0,0 +1,24 @@ +#pragma once + +#include <fstream> +#include <iostream> +#include <string> + +namespace crepe::api { + +class Resource { +public: + Resource(const std::string & src); + +public: + //! Get an input stream to the contents of this resource + const std::istream & read(); + //! Get the canonical path to this resource + const char * canonical(); + +private: + std::string src; + std::ifstream file; +}; + +} // namespace crepe::api |