aboutsummaryrefslogtreecommitdiff
path: root/src/crepe/api
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-11-07 20:52:06 +0100
committerLoek Le Blansch <loek@pipeframe.xyz>2024-11-07 20:52:06 +0100
commit827f09031e2d3cc15e956b242774a4566e1403c1 (patch)
tree5ac1f025afea82ce892272deafcf8918ef518d33 /src/crepe/api
parent1c4156ee127b14760ed3b1a0cd16ad12180c7ac6 (diff)
more WIP audio system
Diffstat (limited to 'src/crepe/api')
-rw-r--r--src/crepe/api/AudioSource.cpp21
-rw-r--r--src/crepe/api/AudioSource.h34
2 files changed, 33 insertions, 22 deletions
diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
index 63fd0d7..b0cf28c 100644
--- a/src/crepe/api/AudioSource.cpp
+++ b/src/crepe/api/AudioSource.cpp
@@ -1,23 +1,22 @@
#include <memory>
-#include "../facade/Sound.h"
-
#include "AudioSource.h"
using namespace crepe;
+using namespace std;
-AudioSource::AudioSource(std::unique_ptr<Asset> audio_clip) {
- this->sound = std::make_unique<crepe::Sound>(std::move(audio_clip));
-}
-
-void AudioSource::play() { return this->play(false); }
+AudioSource::AudioSource(game_object_id_t id, unique_ptr<Asset> audio_clip) :
+ Component(id),
+ audio_clip(std::move(audio_clip))
+{ }
void AudioSource::play(bool looping) {
- this->sound->set_looping(looping);
- this->sound->play();
+ this->loop = looping;
+ this->playing = true;
}
void AudioSource::stop() {
- this->sound->pause();
- this->sound->rewind();
+ this->playing = false;
+ this->rewind = true;
}
+
diff --git a/src/crepe/api/AudioSource.h b/src/crepe/api/AudioSource.h
index 1e24ae8..fd2b6f1 100644
--- a/src/crepe/api/AudioSource.h
+++ b/src/crepe/api/AudioSource.h
@@ -4,36 +4,48 @@
#include "../Asset.h"
#include "../Component.h"
+#include "../types.h"
namespace crepe {
-class Sound;
-
//! Audio source component
class AudioSource : public Component {
public:
- AudioSource(std::unique_ptr<Asset> audio_clip);
+ AudioSource(game_object_id_t id, std::unique_ptr<Asset> audio_clip);
virtual ~AudioSource() = default;
public:
//! Start or resume this audio source
- void play();
- void play(bool looping);
+ void play(bool looping = false);
//! Stop this audio source
void stop();
public:
//! Sample file location
- std::unique_ptr<Asset> audio_clip;
- //! TODO: ?????
- bool play_on_awake;
+ const std::unique_ptr<Asset> audio_clip;
+ //! Play when this component becomes active
+ bool play_on_awake = false;
//! Repeat the current audio clip during playback
- bool loop;
+ bool loop = false;
//! Normalized volume (0.0 - 1.0)
- float volume;
+ float volume = 1.0;
+
+private:
+ //! If this source is playing audio
+ bool playing = false;
+ //! Rewind the sample location
+ bool rewind = false;
private:
- std::unique_ptr<Sound> sound;
+ //! Value of \c active after last system update
+ bool last_active = false;
+ //! Value of \c playing after last system update
+ bool last_playing = false;
+ //! Value of \c volume after last system update
+ float last_volume = 1.0;
+ //! Value of \c loop after last system update
+ bool last_loop = false;
};
} // namespace crepe
+