-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(audio): add audioPlugin and audio sample
Co-Authored-By: João Miguel Nogueira <[email protected]>
- Loading branch information
1 parent
ce15432
commit 044b775
Showing
25 changed files
with
656 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
/// @file | ||
/// @brief Component @ref cubos::engine::AudioListener. | ||
/// @ingroup audio-plugin | ||
|
||
#pragma once | ||
|
||
#include <map> | ||
|
||
#include <cubos/core/al/audio_context.hpp> | ||
#include <cubos/core/reflection/reflect.hpp> | ||
|
||
#include <cubos/engine/api.hpp> | ||
|
||
namespace cubos::engine | ||
{ | ||
/// @brief Component which adds an AudioListener to the entitiy | ||
/// @ingroup audio-plugin | ||
struct CUBOS_ENGINE_API AudioListener | ||
{ | ||
CUBOS_REFLECT; | ||
|
||
bool active{false}; | ||
}; | ||
} // namespace cubos::engine |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/// @file | ||
/// @brief Component @ref cubos::engine::AudioPause. | ||
/// @ingroup audio-plugin | ||
|
||
#pragma once | ||
|
||
#include <glm/glm.hpp> | ||
|
||
#include <cubos/core/reflection/reflect.hpp> | ||
|
||
#include <cubos/engine/api.hpp> | ||
#include <cubos/engine/prelude.hpp> | ||
|
||
namespace cubos::engine | ||
{ | ||
/// @brief Component which adds an AudioSource to the entitiy | ||
/// @ingroup audio-plugin | ||
struct CUBOS_ENGINE_API AudioPause | ||
{ | ||
CUBOS_REFLECT; | ||
}; | ||
} // namespace cubos::engine |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/// @file | ||
/// @brief Component @ref cubos::engine::AudioPlay. | ||
/// @ingroup audio-plugin | ||
|
||
#pragma once | ||
|
||
#include <glm/glm.hpp> | ||
|
||
#include <cubos/core/reflection/reflect.hpp> | ||
|
||
#include <cubos/engine/api.hpp> | ||
#include <cubos/engine/prelude.hpp> | ||
|
||
namespace cubos::engine | ||
{ | ||
/// @brief Component which adds an AudioSource to the entitiy | ||
/// @ingroup audio-plugin | ||
struct CUBOS_ENGINE_API AudioPlay | ||
{ | ||
CUBOS_REFLECT; | ||
}; | ||
} // namespace cubos::engine |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/// @dir | ||
/// @brief @ref audio-plugin plugin directory. | ||
|
||
/// @file | ||
/// @brief Plugin entry point. | ||
/// @ingroup audio-plugin | ||
|
||
#pragma once | ||
|
||
#include <cubos/engine/audio/audio.hpp> | ||
#include <cubos/engine/audio/listener.hpp> | ||
#include <cubos/engine/audio/pause.hpp> | ||
#include <cubos/engine/audio/play.hpp> | ||
#include <cubos/engine/audio/source.hpp> | ||
#include <cubos/engine/audio/stop.hpp> | ||
#include <cubos/engine/prelude.hpp> | ||
|
||
namespace cubos::engine | ||
{ | ||
/// @defgroup audio-plugin Audio | ||
/// @ingroup engine | ||
/// @brief Adds audio to @b Cubos | ||
/// | ||
/// ## Settings | ||
/// - `audio.listener.count` - number of listeners per audio device (default: `4`). | ||
/// | ||
/// ## Dependencies | ||
/// - @ref settings-plugin | ||
|
||
/// @brief Initializes the audio context (after @ref settingsTag). | ||
CUBOS_ENGINE_API extern Tag audioInitTag; | ||
|
||
/// @brief Initializes the audio state (after @ref audioInitTag). | ||
CUBOS_ENGINE_API extern Tag audioStateInitTag; | ||
|
||
/// @brief Plugin entry function. | ||
/// @param cubos @b Cubos main class. | ||
/// @ingroup assets-plugin | ||
CUBOS_ENGINE_API void audioPlugin(Cubos& cubos); | ||
} // namespace cubos::engine |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
/// @file | ||
/// @brief Component @ref cubos::engine::AudioSource. | ||
/// @ingroup audio-plugin | ||
|
||
#pragma once | ||
|
||
#include <glm/glm.hpp> | ||
|
||
#include <cubos/core/al/audio_context.hpp> | ||
#include <cubos/core/reflection/reflect.hpp> | ||
|
||
#include <cubos/engine/api.hpp> | ||
#include <cubos/engine/audio/audio.hpp> | ||
#include <cubos/engine/prelude.hpp> | ||
|
||
namespace cubos::engine | ||
{ | ||
/// @brief Component which adds an AudioSource to the entitiy | ||
/// @ingroup audio-plugin | ||
struct CUBOS_ENGINE_API AudioSource | ||
{ | ||
CUBOS_REFLECT; | ||
|
||
bool playing{false}; | ||
bool looping{false}; | ||
bool stop{false}; | ||
|
||
float gain; | ||
float pitch; | ||
float maxDistance; | ||
float minDistance; | ||
|
||
float innerConeAngle; | ||
float outerConeAngle; | ||
float outerConeGain; | ||
|
||
glm::vec3 coneDirection; | ||
|
||
Asset<Audio> sound{}; | ||
}; | ||
} // namespace cubos::engine |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/// @file | ||
/// @brief Component @ref cubos::engine::AudioStop. | ||
/// @ingroup audio-plugin | ||
|
||
#pragma once | ||
|
||
#include <glm/glm.hpp> | ||
|
||
#include <cubos/core/reflection/reflect.hpp> | ||
|
||
#include <cubos/engine/api.hpp> | ||
#include <cubos/engine/prelude.hpp> | ||
|
||
namespace cubos::engine | ||
{ | ||
/// @brief Component which adds an AudioSource to the entitiy | ||
/// @ingroup audio-plugin | ||
struct CUBOS_ENGINE_API AudioStop | ||
{ | ||
CUBOS_REFLECT; | ||
}; | ||
} // namespace cubos::engine |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"id": "059c16e7-a439-44c7-9bdc-7f133dba0c80" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
#include <cubos/engine/assets/plugin.hpp> | ||
#include <cubos/engine/audio/plugin.hpp> | ||
#include <cubos/engine/collisions/plugin.hpp> | ||
#include <cubos/engine/fixed_step/plugin.hpp> | ||
#include <cubos/engine/physics/plugin.hpp> | ||
#include <cubos/engine/render/camera/camera.hpp> | ||
#include <cubos/engine/render/camera/draws_to.hpp> | ||
#include <cubos/engine/render/camera/perspective.hpp> | ||
#include <cubos/engine/render/defaults/plugin.hpp> | ||
#include <cubos/engine/render/defaults/target.hpp> | ||
#include <cubos/engine/settings/plugin.hpp> | ||
#include <cubos/engine/settings/settings.hpp> | ||
#include <cubos/engine/transform/plugin.hpp> | ||
#include <cubos/engine/window/plugin.hpp> | ||
|
||
using namespace cubos::engine; | ||
|
||
/// [Get handles to assets] | ||
static const Asset<Audio> AudioAsset = AnyAsset("059c16e7-a439-44c7-9bdc-7f133dba0c80"); | ||
/// [Get handles to assets] | ||
|
||
int main(int argc, char** argv) | ||
{ | ||
Cubos cubos{argc, argv}; | ||
|
||
cubos.plugin(settingsPlugin); | ||
cubos.plugin(windowPlugin); | ||
cubos.plugin(transformPlugin); | ||
cubos.plugin(fixedStepPlugin); | ||
cubos.plugin(assetsPlugin); | ||
cubos.plugin(renderDefaultsPlugin); | ||
cubos.plugin(collisionsPlugin); | ||
cubos.plugin(physicsPlugin); | ||
cubos.plugin(audioPlugin); | ||
|
||
cubos.startupSystem("configure Assets").before(settingsTag).call([](Settings& settings) { | ||
settings.setString("assets.app.osPath", APP_ASSETS_PATH); | ||
settings.setString("assets.builtin.osPath", BUILTIN_ASSETS_PATH); | ||
}); | ||
|
||
cubos.startupSystem("create a camera").call([](Commands cmds) { | ||
auto targetEnt = cmds.create().add(RenderTargetDefaults{}).entity(); | ||
|
||
cmds.create() | ||
.relatedTo(targetEnt, DrawsTo{}) | ||
.add(Camera{.zNear = 0.1F, .zFar = 1000.0F}) | ||
.add(PerspectiveCamera{.fovY = 60.0F}) | ||
.add(Position{{0.0F, 0.0F, 0.0F}}) | ||
.add(Rotation::lookingAt({-1.0F, -1.0F, -1.0F}, glm::vec3{0.0F, 1.0F, 0.0F})) | ||
.add(AudioListener{true}); | ||
}); | ||
|
||
cubos.startupSystem("create an audio source").after(audioStateInitTag).call([](Commands cmds) { | ||
cmds.create() | ||
.add(Position{{0.0F, 0.0F, 0.0F}}) | ||
.add(Velocity{.vec = {1.0F, 1.0F, 1.0F}}) | ||
.add(Rotation::lookingAt({-1.0F, -1.0F, -1.0F}, glm::vec3{0.0F, 1.0F, 0.0F})) | ||
.add(AudioSource{}); | ||
}); | ||
|
||
cubos.system("play audio").call([](Commands cmds, Query<Entity, AudioSource&> query) { | ||
for (auto [ent, src] : query) | ||
{ | ||
if (src.sound.isNull()) | ||
{ | ||
src.sound = AudioAsset; | ||
cmds.add(ent, AudioPlay{}); | ||
} | ||
} | ||
}); | ||
|
||
cubos.run(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
#include <cubos/core/ecs/reflection.hpp> | ||
#include <cubos/core/reflection/external/primitives.hpp> | ||
|
||
#include <cubos/engine/audio/listener.hpp> | ||
|
||
CUBOS_REFLECT_IMPL(cubos::engine::AudioListener) | ||
{ | ||
return core::ecs::TypeBuilder<AudioListener>("cubos::engine::AudioListener") | ||
.withField("active", &AudioListener::active) | ||
.build(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
#include "listener_impl.hpp" | ||
|
||
#include <cubos/core/ecs/reflection.hpp> | ||
#include <cubos/core/reflection/external/primitives.hpp> | ||
|
||
CUBOS_REFLECT_IMPL(cubos::engine::AudioListenerImpl) | ||
{ | ||
return core::ecs::TypeBuilder<AudioListenerImpl>("cubos::engine::AudioListenerImpl") | ||
.withField("index", &AudioListenerImpl::index) | ||
.build(); | ||
} |
Oops, something went wrong.