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

remove std::array and std::bitset aliases

Browse Source
This commit is contained in:
Matvey Cherevko
2019-05-25 03:54:50 +07:00
parent 26abbee1b6
commit 534c915dbd
11 changed files with 24 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
headers/enduro2d/base/types.hpp
View File

@@ -32,13 +32,6 @@ namespace e2d
class exception
: public std::exception {};
template < typename Value
, std::size_t Size >
using array = std::array<Value, Size>;
template < std::size_t Size >
using bitset = std::bitset<Size>;
template < typename Value
, typename Allocator = std::allocator<Value> >
using vector = std::vector<Value, Allocator>;
@@ -81,12 +74,12 @@ namespace e2d
{
template < typename Key
, typename Compare = std::less<>
, typename Container = std::vector<Key> >
, typename Container = vector<Key> >
using flat_set = flat_hpp::flat_set<Key, Compare, Container>;
template < typename Key
, typename Value
, typename Compare = std::less<>
, typename Container = std::vector<std::pair<Key, Value>> >
, typename Container = vector<std::pair<Key, Value>> >
using flat_map = flat_hpp::flat_map<Key, Value, Compare, Container>;
}

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

@@ -194,7 +194,7 @@ namespace e2d
std::size_t bytes_per_vertex() const noexcept;
private:
constexpr static std::size_t max_attribute_count = 8;
array<attribute_info, max_attribute_count> attributes_;
std::array<attribute_info, max_attribute_count> attributes_;
std::size_t attribute_count_ = 0;
std::size_t bytes_per_vertex_ = 0;
};
@@ -728,7 +728,7 @@ namespace e2d
const property_block& properties() const noexcept;
private:
constexpr static std::size_t max_pass_count = 8;
array<pass_state, max_pass_count> passes_;
std::array<pass_state, max_pass_count> passes_;
std::size_t pass_count_ = 0;
property_block properties_;
};
@@ -755,7 +755,7 @@ namespace e2d
private:
constexpr static std::size_t max_vertices_count = 8;
index_buffer_ptr indices_;
array<vertex_buffer_ptr, max_vertices_count> vertices_;
std::array<vertex_buffer_ptr, max_vertices_count> vertices_;
std::size_t vertices_count_ = 0;
topology topology_ = topology::triangles;
};
@@ -880,7 +880,7 @@ namespace e2d
const command_value& command(std::size_t index) const noexcept;
std::size_t command_count() const noexcept;
private:
array<command_value, N> commands_;
std::array<command_value, N> commands_;
std::size_t command_count_ = 0;
};

2
headers/enduro2d/utils/buffer.hpp
View File

@@ -68,7 +68,7 @@ namespace e2d
, size_(buffer.size() * sizeof(T)) {}
template < typename T, std::size_t N >
buffer_view(const array<T,N>& buffer) noexcept
buffer_view(const std::array<T,N>& buffer) noexcept
: data_(buffer.data())
, size_(buffer.size() * sizeof(T)) {}

18
sources/enduro2d/core/input.cpp
View File

@@ -17,11 +17,11 @@ namespace e2d
mutable std::mutex mutex;
v2f cursor_pos;
v2f scroll_delta;
bitset<
std::bitset<
utils::enum_to_underlying(mouse_button::unknown) + 1> pressed;
bitset<
std::bitset<
utils::enum_to_underlying(mouse_button::unknown) + 1> just_pressed;
bitset<
std::bitset<
utils::enum_to_underlying(mouse_button::unknown) + 1> just_released;
public:
std::size_t button_index(mouse_button btn) const noexcept {
@@ -80,11 +80,11 @@ namespace e2d
public:
mutable std::mutex mutex;
str32 input_text;
bitset<
std::bitset<
utils::enum_to_underlying(keyboard_key::unknown) + 1> pressed;
bitset<
std::bitset<
utils::enum_to_underlying(keyboard_key::unknown) + 1> just_pressed;
bitset<
std::bitset<
utils::enum_to_underlying(keyboard_key::unknown) + 1> just_released;
public:
std::size_t key_index(keyboard_key key) const noexcept {
@@ -260,7 +260,7 @@ namespace e2d
return state_->just_released.test(index);
}
void keyboard::extract_pressed_keys(std::vector<keyboard_key>& dst) const {
void keyboard::extract_pressed_keys(vector<keyboard_key>& dst) const {
std::lock_guard<std::mutex> guard(state_->mutex);
for ( std::size_t i = 0; i < state_->pressed.size(); ++i ) {
if ( state_->pressed.test(i) ) {
@@ -269,7 +269,7 @@ namespace e2d
}
}
void keyboard::extract_just_pressed_keys(std::vector<keyboard_key>& dst) const {
void keyboard::extract_just_pressed_keys(vector<keyboard_key>& dst) const {
std::lock_guard<std::mutex> guard(state_->mutex);
for ( std::size_t i = 0; i < state_->just_pressed.size(); ++i ) {
if ( state_->just_pressed.test(i) ) {
@@ -278,7 +278,7 @@ namespace e2d
}
}
void keyboard::extract_just_released_keys(std::vector<keyboard_key>& dst) const {
void keyboard::extract_just_released_keys(vector<keyboard_key>& dst) const {
std::lock_guard<std::mutex> guard(state_->mutex);
for ( std::size_t i = 0; i < state_->just_released.size(); ++i ) {
if ( state_->just_released.test(i) ) {

2
sources/enduro2d/core/window_impl/window_glfw.cpp
View File

@@ -249,7 +249,7 @@ namespace e2d
public:
using window_uptr = std::unique_ptr<
GLFWwindow, void(*)(GLFWwindow*)>;
using listeners_t = std::vector<event_listener_uptr>;
using listeners_t = vector<event_listener_uptr>;
public:
listeners_t listeners;
std::recursive_mutex rmutex;

2
sources/enduro2d/core/window_impl/window_none.cpp
View File

@@ -12,7 +12,7 @@ namespace e2d
{
class window::state final : private e2d::noncopyable {
public:
using listeners_t = std::vector<event_listener_uptr>;
using listeners_t = vector<event_listener_uptr>;
public:
listeners_t listeners;
std::recursive_mutex rmutex;

2
sources/enduro2d/utils/mesh_impl/mesh_reader_e2d.cpp
View File

@@ -14,7 +14,7 @@ namespace
const str_view mesh_file_signature = "e2d_mesh";
template < typename T >
input_sequence& iseq_read_vector_pods(input_sequence& iseq, std::vector<T>& v) {
input_sequence& iseq_read_vector_pods(input_sequence& iseq, vector<T>& v) {
return iseq.read(v.data(), v.size() * sizeof(T));
}

2
sources/enduro2d/utils/shape_impl/shape_reader_e2d.cpp
View File

@@ -14,7 +14,7 @@ namespace
const str_view shape_file_signature = "e2d_shape";
template < typename T >
input_sequence& iseq_read_vector_pods(input_sequence& iseq, std::vector<T>& v) {
input_sequence& iseq_read_vector_pods(input_sequence& iseq, vector<T>& v) {
return iseq.read(v.data(), v.size() * sizeof(T));
}

4
untests/sources/untests_core/input.cpp
View File

@@ -80,7 +80,7 @@ TEST_CASE("input"){
input i;
const mouse& m = i.mouse();
std::vector<mouse_button> buttons;
vector<mouse_button> buttons;
m.extract_pressed_buttons(buttons);
m.extract_just_pressed_buttons(buttons);
m.extract_just_released_buttons(buttons);
@@ -208,7 +208,7 @@ TEST_CASE("input"){
input i;
const keyboard& k = i.keyboard();
std::vector<keyboard_key> keys;
vector<keyboard_key> keys;
k.extract_pressed_keys(keys);
k.extract_just_pressed_keys(keys);
k.extract_just_released_keys(keys);

2
untests/sources/untests_utils/buffer.cpp
View File

@@ -200,7 +200,7 @@ TEST_CASE("buffer_view") {
REQUIRE(v4.data() == b1.data());
REQUIRE(v4.size() == 10);
array<u32,5> b2{'h', 'e', 'l', 'l', 'o'};
std::array<u32,5> b2{'h', 'e', 'l', 'l', 'o'};
buffer_view v5(b2);
REQUIRE(v5.data() == b2.data());
REQUIRE(v5.size() == 20);

2
untests/sources/untests_utils/intrusive_ptr.cpp
View File

@@ -247,7 +247,7 @@ TEST_CASE("intrusive_ptr") {
}
{
auto p1 = make_intrusive<obj_t>(10);
std::unordered_set<intrusive_ptr<obj_t>> s;
hash_set<intrusive_ptr<obj_t>> s;
s.insert(p1);
}
{