BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2026-02-04 23:39:21 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix ci build. update modules.

Browse Source
This commit is contained in:
Matvey Cherevko
2018-10-15 13:23:09 +07:00
parent 0428f97be8
commit f2c0185095
6 changed files with 31 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -72,6 +72,10 @@ matrix:
compiler: clang
before_install:
- eval "${MATRIX_EVAL}"
script:
- if [ "$TRAVIS_OS_NAME" == 'osx' ]; then brew update; brew install git-lfs; fi
before_script:
- git submodule update --init --recursive
- git lfs install
- git lfs pull
script:
- ./scripts/build_all.sh

51
headers/enduro2d/core/render.hpp
View File

@@ -40,20 +40,20 @@ namespace e2d
public:
index_type type = index_type::unsigned_short;
public:
index_info() noexcept;
~index_info() noexcept;
index_info() = default;
~index_info() noexcept = default;
index_info(const index_info&) noexcept;
index_info& operator=(const index_info&) noexcept;
index_info(const index_info&) noexcept = default;
index_info& operator=(const index_info&) noexcept = default;
explicit index_info(index_type type) noexcept;
};
public:
index_declaration() noexcept;
~index_declaration() noexcept;
index_declaration() = default;
~index_declaration() noexcept = default;
index_declaration(const index_declaration&) noexcept;
index_declaration& operator=(const index_declaration&) noexcept;
index_declaration(const index_declaration&) noexcept = default;
index_declaration& operator=(const index_declaration&) noexcept = default;
explicit index_declaration(index_type index_type) noexcept;
@@ -99,11 +99,11 @@ namespace e2d
attribute_type type = attribute_type::floating_point;
bool normalized = false;
public:
attribute_info() noexcept;
~attribute_info() noexcept;
attribute_info() = default;
~attribute_info() noexcept = default;
attribute_info(const attribute_info&) noexcept;
attribute_info& operator=(const attribute_info&) noexcept;
attribute_info(const attribute_info&) noexcept = default;
attribute_info& operator=(const attribute_info&) noexcept = default;
attribute_info(
std::size_t stride,
@@ -116,11 +116,11 @@ namespace e2d
std::size_t row_size() const noexcept;
};
public:
vertex_declaration() noexcept;
~vertex_declaration() noexcept;
vertex_declaration() = default;
~vertex_declaration() noexcept = default;
vertex_declaration(const vertex_declaration&) noexcept;
vertex_declaration& operator=(const vertex_declaration&) noexcept;
vertex_declaration(const vertex_declaration&) noexcept = default;
vertex_declaration& operator=(const vertex_declaration&) noexcept = default;
template < typename T >
vertex_declaration& add_attribute(str_hash name) noexcept;
@@ -315,10 +315,10 @@ namespace e2d
enum class blending_color_mask : u8 {
none = 0,
r = (u8(1) << u8(0)),
g = (u8(1) << u8(1)),
b = (u8(1) << u8(2)),
a = (u8(1) << u8(3)),
r = (1 << 0),
g = (1 << 1),
b = (1 << 2),
a = (1 << 3),
rg = r | g,
rb = r | b,
@@ -507,14 +507,11 @@ namespace e2d
class property_block final {
public:
property_block() noexcept;
~property_block() noexcept;
property_block() = default;
~property_block() noexcept = default;
property_block(property_block&&) noexcept;
property_block& operator=(property_block&&) noexcept;
property_block(const property_block&);
property_block& operator=(const property_block&);
property_block(const property_block&) = default;
property_block& operator=(const property_block&) = default;
property_block& clear() noexcept;
property_block& merge(const property_block& pb);

1
headers/enduro2d/utils/strings.inl
View File

@@ -154,7 +154,6 @@ namespace e2d
}
} catch (...) {
E2D_ASSERT_MSG(false, "basic_string_hash: unexpected debug exception");
throw;
}
#else
E2D_UNUSED(hash, str);

2
modules/catch2

Submodule modules/catch2 updated: 9e1bdca466...e1307016f0

2
modules/utfcpp

Submodule modules/utfcpp updated: 60c490b89f...0a23881341

41
sources/enduro2d/core/render.cpp
View File

@@ -44,14 +44,6 @@ namespace e2d
// index_declaration::index_info
//
index_declaration::index_info::index_info() noexcept = default;
index_declaration::index_info::~index_info() noexcept = default;
index_declaration::index_info::index_info(
const index_info&) noexcept = default;
index_declaration::index_info& index_declaration::index_info::operator=(
const index_info&) noexcept = default;
index_declaration::index_info::index_info(index_type ntype) noexcept
: type(ntype) {}
@@ -59,14 +51,6 @@ namespace e2d
// index_declaration
//
index_declaration::index_declaration() noexcept = default;
index_declaration::~index_declaration() noexcept = default;
index_declaration::index_declaration(
const index_declaration&) noexcept = default;
index_declaration& index_declaration::operator=(
const index_declaration&) noexcept = default;
index_declaration::index_declaration(index_type type) noexcept
: index_(type) {}
@@ -105,14 +89,6 @@ namespace e2d
// vertex_declaration::attribute_info
//
vertex_declaration::attribute_info::attribute_info() noexcept = default;
vertex_declaration::attribute_info::~attribute_info() noexcept = default;
vertex_declaration::attribute_info::attribute_info(
const attribute_info&) noexcept = default;
vertex_declaration::attribute_info& vertex_declaration::attribute_info::operator=(
const attribute_info&) noexcept = default;
vertex_declaration::attribute_info::attribute_info(
std::size_t nstride,
str_hash nname,
@@ -135,14 +111,6 @@ namespace e2d
// vertex_declaration
//
vertex_declaration::vertex_declaration() noexcept = default;
vertex_declaration::~vertex_declaration() noexcept = default;
vertex_declaration::vertex_declaration(
const vertex_declaration&) noexcept = default;
vertex_declaration& vertex_declaration::operator=(
const vertex_declaration&) noexcept = default;
vertex_declaration& vertex_declaration::normalized() noexcept {
E2D_ASSERT(attribute_count_ > 0);
attributes_[attribute_count_ - 1].normalized = true;
@@ -521,15 +489,6 @@ namespace e2d
// render::property_block
//
render::property_block::property_block() noexcept = default;
render::property_block::~property_block() noexcept = default;
render::property_block::property_block(property_block&&) noexcept = default;
render::property_block& render::property_block::operator=(property_block&&) noexcept = default;
render::property_block::property_block(const property_block&) = default;
render::property_block& render::property_block::operator=(const property_block&) = default;
render::property_block& render::property_block::clear() noexcept {
properties_.clear();
samplers_.clear();