BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-15 00:11:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix sound_asset loading

Browse Source
This commit is contained in:
Matvey Cherevko
2019-07-09 11:25:40 +07:00
parent 7cdbf31f29
commit af680ed986
13 changed files with 76 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -11,3 +11,4 @@
*.dylib filter=lfs diff=lfs merge=lfs -text
*.pvr filter=lfs diff=lfs merge=lfs -text
*.dds filter=lfs diff=lfs merge=lfs -text
*.ogg filter=lfs diff=lfs merge=lfs -text

2
headers/enduro2d/high/_all.hpp
View File

@@ -19,11 +19,11 @@
#include "assets/prefab_asset.hpp"
#include "assets/shader_asset.hpp"
#include "assets/shape_asset.hpp"
#include "assets/sound_asset.hpp"
#include "assets/sprite_asset.hpp"
#include "assets/text_asset.hpp"
#include "assets/texture_asset.hpp"
#include "assets/xml_asset.hpp"
#include "assets/sound_asset.hpp"
#include "components/actor.hpp"
#include "components/camera.hpp"

2
headers/enduro2d/high/_high.hpp
View File

@@ -31,11 +31,11 @@ namespace e2d
class prefab_asset;
class shader_asset;
class shape_asset;
class sound_asset;
class sprite_asset;
class text_asset;
class texture_asset;
class xml_asset;
class sound_asset;
class actor;
class camera;

2
headers/enduro2d/high/assets/sound_asset.hpp
View File

@@ -12,7 +12,7 @@
namespace e2d
{
class sound_asset final : public content_asset<sound_asset, sound_source_ptr> {
class sound_asset final : public content_asset<sound_asset, sound_stream_ptr> {
public:
static const char* type_name() noexcept { return "sound_asset"; }
static load_async_result load_async(const library& library, str_view address);

52
sources/enduro2d/high/assets/sound_asset.cpp
View File

@@ -21,11 +21,11 @@ namespace
const char* sound_asset_schema_source = R"json({
"type" : "object",
"required" : [ "sound", "stream" ],
"required" : [ "sound", "streaming" ],
"additionalProperties" : false,
"properties" : {
"sound" : { "$ref": "#/common_definitions/address" },
"stream" : { "type" : "boolean" }
"streaming" : { "type" : "boolean" }
}
})json";
@@ -47,34 +47,45 @@ namespace
return *schema;
}
stdex::promise<sound_source_ptr> parse_sound(
stdex::promise<sound_stream_ptr> parse_sound(
const library& library,
str_view parent_address,
const rapidjson::Value& root)
{
E2D_ASSERT(root.HasMember("sound") && root["sound"].IsString());
str address = path::combine(parent_address, root["sound"].GetString());
const str sound_address = path::combine(parent_address, root["sound"].GetString());
E2D_ASSERT(root.HasMember("stream") && root["stream"].IsBool());
bool stream = root["stream"].GetBool();
E2D_ASSERT(root.HasMember("streaming") && root["streaming"].IsBool());
const bool streaming = root["streaming"].GetBool();
const auto asset_url = library.root() / address;
jobber_hpp::promise<sound_source_ptr> result;
if ( stream ) {
result.resolve(std::move(the<audio>().create_source(
the<audio>().create_stream(
the<vfs>().read(asset_url)))));
if ( streaming ) {
return the<deferrer>().do_in_worker_thread([
sound_url = library.root() / sound_address
](){
auto sound_file_stream = the<vfs>().read(sound_url);
if ( !sound_file_stream ) {
throw sound_asset_loading_exception();
}
sound_stream_ptr content = the<audio>().create_stream(
std::move(sound_file_stream));
if ( !content ) {
throw sound_asset_loading_exception();
}
return content;
});
} else {
result = the<vfs>().load_async(asset_url)
.then([](auto&& content){
return the<deferrer>().do_in_main_thread([content](){
return std::move(the<audio>().create_source(
the<audio>().preload_stream(content)));
return library.load_asset_async<binary_asset>(sound_address)
.then([](const binary_asset::load_result& sound_data){
return the<deferrer>().do_in_worker_thread([sound_data](){
sound_stream_ptr content = the<audio>().preload_stream(
sound_data->content());
if ( !content ) {
throw sound_asset_loading_exception();
}
return content;
});
});
}
return result;
}
}
@@ -117,7 +128,8 @@ namespace e2d
library, parent_address, *sound_data->content());
})
.then([](auto&& content){
return sound_asset::create(std::forward<decltype(content)>(content));
return sound_asset::create(
std::forward<decltype(content)>(content));
});
});
}

4
untests/bin/library/music.json Normal file
View File

@@ -0,0 +1,4 @@
{
"sound" : "sound.ogg",
"streaming" : true
}

4
untests/bin/library/sound.json Normal file
View File

@@ -0,0 +1,4 @@
{
"sound" : "sound.ogg",
"streaming" : false
}

3
untests/bin/library/sound.ogg Executable file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:910a0ad63ca51685b541e285550c5cc13ff04be2b48a77314d0bf138b044e3d6
size 15891

1
untests/sources/untests_high/asset.cpp
View File

@@ -15,6 +15,7 @@ namespace
modules::initialize<starter>(0, nullptr,
starter::parameters(
engine::parameters("asset_untests", "enduro2d")
.without_audio(true)
.without_graphics(true)));
}

15
untests/sources/untests_high/library.cpp
View File

@@ -15,6 +15,7 @@ namespace
modules::initialize<starter>(0, nullptr,
starter::parameters(
engine::parameters("library_untests", "enduro2d")
.without_audio(true)
.without_graphics(true)));
}
@@ -155,6 +156,20 @@ TEST_CASE("library"){
REQUIRE_FALSE(l.cache().find<image_asset>("image.png"));
REQUIRE_FALSE(l.cache().find<binary_asset>("image.png"));
}
{
if ( modules::is_initialized<audio>() ) {
auto sound_res = l.load_asset<sound_asset>("sound.json");
REQUIRE(sound_res);
REQUIRE(sound_res->content());
auto music_res = l.load_asset<sound_asset>("music.json");
REQUIRE(music_res);
REQUIRE(music_res->content());
auto fake_sound_res = l.load_asset<sound_asset>("fake_sound.json");
REQUIRE_FALSE(fake_sound_res);
}
}
{
if ( modules::is_initialized<render>() ) {
auto shader_res = l.load_asset<shader_asset>("shader.json");

1
untests/sources/untests_high/node.cpp
View File

@@ -15,6 +15,7 @@ namespace
modules::initialize<starter>(0, nullptr,
starter::parameters(
engine::parameters("world_untests", "enduro2d")
.without_audio(true)
.without_graphics(true)));
}

1
untests/sources/untests_high/starter.cpp
View File

@@ -11,6 +11,7 @@ TEST_CASE("starter"){
modules::initialize<starter>(0, nullptr,
starter::parameters(
engine::parameters("starter_untests", "enduro2d")
.without_audio(true)
.without_graphics(true)));
modules::shutdown<starter>();
}

1
untests/sources/untests_high/world.cpp
View File

@@ -15,6 +15,7 @@ namespace
modules::initialize<starter>(0, nullptr,
starter::parameters(
engine::parameters("world_untests", "enduro2d")
.without_audio(true)
.without_graphics(true)));
}