aboutsummaryrefslogtreecommitdiff
path: root/src/crepe
diff options
context:
space:
mode:
authorLoek Le Blansch <loek@pipeframe.xyz>2024-09-25 17:36:31 +0200
committerLoek Le Blansch <loek@pipeframe.xyz>2024-09-25 17:36:31 +0200
commitf3eeedc91a04ca0651e0fe78a2119e7e3e38e391 (patch)
treefc2265ccc90abcefbdf2eb7670eb2c30c56da300 /src/crepe
parentf4560e02f703f1c6f857c8e5af63fa9fc4ca6438 (diff)
WIP Audio API + facade
Diffstat (limited to 'src/crepe')
-rw-r--r--src/crepe/CMakeLists.txt7
-rw-r--r--src/crepe/Sound.cpp9
-rw-r--r--src/crepe/Sound.h30
-rw-r--r--src/crepe/api/AudioSource.cpp25
-rw-r--r--src/crepe/api/AudioSource.h42
-rw-r--r--src/crepe/api/CMakeLists.txt4
-rw-r--r--src/crepe/api/Component.h11
-rw-r--r--src/crepe/api/Resource.h17
-rw-r--r--src/crepe/main.cpp3
-rw-r--r--src/crepe/util/CMakeLists.txt0
-rw-r--r--src/crepe/util/debug.cpp0
-rw-r--r--src/crepe/util/debug.h0
12 files changed, 143 insertions, 5 deletions
diff --git a/src/crepe/CMakeLists.txt b/src/crepe/CMakeLists.txt
index 392b7d7..aa64262 100644
--- a/src/crepe/CMakeLists.txt
+++ b/src/crepe/CMakeLists.txt
@@ -1,3 +1,6 @@
-target_sources(main PUBLIC
- main.cpp
+target_sources(crepe PUBLIC
+ Sound.cpp
)
+
+add_subdirectory(api)
+
diff --git a/src/crepe/Sound.cpp b/src/crepe/Sound.cpp
new file mode 100644
index 0000000..f45a697
--- /dev/null
+++ b/src/crepe/Sound.cpp
@@ -0,0 +1,9 @@
+#include "Sound.h"
+
+using namespace crepe;
+
+Sound::Sound(std::unique_ptr<api::Resource> res) {
+ _res = std::move(res);
+}
+
+
diff --git a/src/crepe/Sound.h b/src/crepe/Sound.h
new file mode 100644
index 0000000..ac4b7f4
--- /dev/null
+++ b/src/crepe/Sound.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <soloud.h>
+
+#include <memory>
+
+#include "api/Resource.h"
+
+namespace crepe {
+
+class Sound {
+public:
+ Sound(std::unique_ptr<api::Resource> res);
+ virtual ~Sound() = default;
+
+public:
+ void pause();
+ void play();
+ void rewind();
+ void set_volume(float volume);
+ void set_looping(bool looping);
+
+private:
+ std::unique_ptr<api::Resource> _res;
+ SoLoud::handle _handle;
+ bool _paused;
+};
+
+}
+
diff --git a/src/crepe/api/AudioSource.cpp b/src/crepe/api/AudioSource.cpp
new file mode 100644
index 0000000..cbde79f
--- /dev/null
+++ b/src/crepe/api/AudioSource.cpp
@@ -0,0 +1,25 @@
+#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..6a038be
--- /dev/null
+++ b/src/crepe/api/AudioSource.h
@@ -0,0 +1,42 @@
+#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;
+};
+
+}
+
diff --git a/src/crepe/api/CMakeLists.txt b/src/crepe/api/CMakeLists.txt
new file mode 100644
index 0000000..94617a4
--- /dev/null
+++ b/src/crepe/api/CMakeLists.txt
@@ -0,0 +1,4 @@
+target_sources(crepe PUBLIC
+ AudioSource.cpp
+)
+
diff --git a/src/crepe/api/Component.h b/src/crepe/api/Component.h
new file mode 100644
index 0000000..2abb461
--- /dev/null
+++ b/src/crepe/api/Component.h
@@ -0,0 +1,11 @@
+#pragma once
+
+namespace crepe::api {
+
+class Component {
+public:
+ bool active;
+};
+
+}
+
diff --git a/src/crepe/api/Resource.h b/src/crepe/api/Resource.h
new file mode 100644
index 0000000..620a10e
--- /dev/null
+++ b/src/crepe/api/Resource.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <string>
+
+namespace crepe::api {
+
+class Resource {
+public:
+ Resource(const std::string & source);
+ virtual ~Resource();
+
+private:
+ std::string _source;
+};
+
+}
+
diff --git a/src/crepe/main.cpp b/src/crepe/main.cpp
deleted file mode 100644
index 8e9a184..0000000
--- a/src/crepe/main.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <stdio.h>
-
-int main() { printf("Hello World!\n"); }
diff --git a/src/crepe/util/CMakeLists.txt b/src/crepe/util/CMakeLists.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/crepe/util/CMakeLists.txt
diff --git a/src/crepe/util/debug.cpp b/src/crepe/util/debug.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/crepe/util/debug.cpp
diff --git a/src/crepe/util/debug.h b/src/crepe/util/debug.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/crepe/util/debug.h