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

fix samples

Browse Source
This commit is contained in:
Matvey Cherevko
2019-05-25 20:49:08 +07:00
parent 92b0c5b837
commit 9e5f32b041
5 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/sources/sample_00/sample_00.cpp
View File

@@ -68,11 +68,11 @@ namespace
} }
}; };
array<u8,6> generate_quad_indices() noexcept { std::array<u8,6> generate_quad_indices() noexcept {
return {0, 1, 2, 2, 1, 3}; return {0, 1, 2, 2, 1, 3};
} }
array<vertex1,4> generate_quad_vertices(const v2u& size) noexcept { std::array<vertex1,4> generate_quad_vertices(const v2u& size) noexcept {
f32 hw = size.x * 0.5f; f32 hw = size.x * 0.5f;
f32 hh = size.y * 0.5f; f32 hh = size.y * 0.5f;
return { return {
@@ -82,7 +82,7 @@ namespace
vertex1{{ hw, -hh, 0.f}, {1, 0}}}; vertex1{{ hw, -hh, 0.f}, {1, 0}}};
} }
array<vertex2,4> generate_quad_colors() noexcept { std::array<vertex2,4> generate_quad_colors() noexcept {
return { return {
vertex2{color32::red()}, vertex2{color32::red()},
vertex2{color32::green()}, vertex2{color32::green()},

6
samples/sources/sample_01/sample_01.cpp
View File

@@ -60,7 +60,7 @@ namespace
} }
}; };
array<u8,36> generate_cube_indices() noexcept { std::array<u8,36> generate_cube_indices() noexcept {
return { return {
0, 1, 2, 0, 1, 2,
2, 3, 0, 2, 3, 0,
@@ -81,7 +81,7 @@ namespace
22, 23, 20}; 22, 23, 20};
} }
array<vertex1,24> generate_cube_vertices(const v3f& size) noexcept { std::array<vertex1,24> generate_cube_vertices(const v3f& size) noexcept {
f32 x = size.x * 0.5f; f32 x = size.x * 0.5f;
f32 y = size.y * 0.5f; f32 y = size.y * 0.5f;
f32 z = size.z * 0.5f; f32 z = size.z * 0.5f;
@@ -117,7 +117,7 @@ namespace
vertex1{{-x, y, z}, {0, 0}}}; vertex1{{-x, y, z}, {0, 0}}};
} }
array<vertex2,24> generate_cube_colors() noexcept { std::array<vertex2,24> generate_cube_colors() noexcept {
return { return {
vertex2{color32::red()}, vertex2{color32::red()},
vertex2{color32::green()}, vertex2{color32::green()},

4
samples/sources/sample_02/sample_02.cpp
View File

@@ -48,7 +48,7 @@ namespace
} }
}; };
array<u8,36> generate_cube_indices() noexcept { std::array<u8,36> generate_cube_indices() noexcept {
return { return {
0, 1, 2, 0, 1, 2,
2, 3, 0, 2, 3, 0,
@@ -69,7 +69,7 @@ namespace
22, 23, 20}; 22, 23, 20};
} }
array<vertex,24> generate_cube_vertices(const v3f& size) noexcept { std::array<vertex,24> generate_cube_vertices(const v3f& size) noexcept {
f32 x = size.x * 0.5f; f32 x = size.x * 0.5f;
f32 y = size.y * 0.5f; f32 y = size.y * 0.5f;
f32 z = size.z * 0.5f; f32 z = size.z * 0.5f;

6
sources/enduro2d/core/vfs.cpp
View File

@@ -114,8 +114,7 @@ namespace e2d
bool vfs::register_scheme(str_view scheme, file_source_uptr source) { bool vfs::register_scheme(str_view scheme, file_source_uptr source) {
std::lock_guard<std::mutex> guard(state_->mutex); std::lock_guard<std::mutex> guard(state_->mutex);
return (source && source->valid()) return (source && source->valid())
? state_->schemes.insert( ? state_->schemes.emplace(scheme, std::move(source)).second
std::make_pair(scheme, std::move(source))).second
: false; : false;
} }
@@ -129,8 +128,7 @@ namespace e2d
bool vfs::register_scheme_alias(str_view scheme, url alias) { bool vfs::register_scheme_alias(str_view scheme, url alias) {
std::lock_guard<std::mutex> guard(state_->mutex); std::lock_guard<std::mutex> guard(state_->mutex);
return state_->aliases.insert( return state_->aliases.emplace(scheme, std::move(alias)).second;
std::make_pair(scheme, alias)).second;
} }
bool vfs::unregister_scheme_alias(str_view scheme) { bool vfs::unregister_scheme_alias(str_view scheme) {

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

@@ -590,7 +590,7 @@ TEST_CASE("node") {
} }
SECTION("for_each_child") { SECTION("for_each_child") {
auto p = node::create(); auto p = node::create();
array<node_iptr, 3> ns{ std::array<node_iptr, 3> ns{
node::create(p), node::create(p),
node::create(p), node::create(p),
node::create(p)}; node::create(p)};